Re: commit-id fails after cg-init

From: David A. Wheeler <dwheeler@dwheeler.com>
Date: May 6, 2005, 03:06 UTC
Message-ID: <427ADF1B.5000101@dwheeler.com>
In-Reply-To: <200505051122.03111.snake@penza-gsm.ru>

I said:

Show 7 quoted lines

>>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