From: "David A. Wheeler" <dwheeler@dwheeler.com>
To: Alexey Nezhdanov <snake@penza-gsm.ru>
Cc: git@vger.kernel.org
Subject: Re: commit-id fails after cg-init
Date: Thu, 05 May 2005 23:06:03 -0400 [thread overview]
Message-ID: <427ADF1B.5000101@dwheeler.com> (raw)
In-Reply-To: <200505051122.03111.snake@penza-gsm.ru>
I said:
>>There's an interesting side-effect of this; I _think_ it's
>>fine but it might be worth thinking through. If all
>>new projects start with an empty tree, that creates a
>>"common root" that all projects can appeal to.
>>That means that in theory a merge between any two project root
>>trees can eventually find a common ancestor: the empty tree.
>>I _think_ that's okay... is it?
Alexey Nezhdanov wrote:
> I think this problem can be easily solved with:
> 1) Restricting to auto-select empty commit as the merge base
> 2) Make an exception from rule (1) for first real commit
Okay, but that's only true if this is really a problem.
I'm not sure it _is_, in fact I think the semantics make perfect sense.
I just wanted to note that as the kind of change
that MIGHT have a surprising side-effect, so if anyone knew of one,
please speak up!
> By (1) we will restrict accidental bad merges that can happen due to crasy
> operator - he will need to explicitly select empty commit as merge base.
Is that really a problem, though? It seems to me that since a
bad merge can be undone, it's not really a problem.
--- David A. Wheeler
next prev parent reply other threads:[~2005-05-06 2:56 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-05-03 20:03 commit-id fails after cg-init Pavel Roskin
2005-05-03 21:13 ` Petr Baudis
2005-05-04 15:14 ` David A. Wheeler
2005-05-04 15:45 ` H. Peter Anvin
2005-05-05 7:22 ` Alexey Nezhdanov
2005-05-06 3:06 ` David A. Wheeler [this message]
2005-05-03 21:14 ` Joel Becker
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=427ADF1B.5000101@dwheeler.com \
--to=dwheeler@dwheeler.com \
--cc=git@vger.kernel.org \
--cc=snake@penza-gsm.ru \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).