[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: adding on branch

From: Stefan Monnier
Subject: Re: adding on branch
Date: 28 May 2003 11:17:57 -0400
User-agent: Gnus/5.09 (Gnus v5.9.0) Emacs/21.3.50

>> I think that's due to your revision 1.2 above.  I'm not sure why you needed
>> to do that.
> It is for dealing with merger issues... that is still the hardest
> problem. Finding the correct greatest common ancestor version.

Could you expand on it ?
The more I think about it, the more I feel that when import sees a file
with no vendor branch yet and with a dead rev 1.1, it should do all the
same as it currently does plus set the default branch to 1.1.1 (or
wherever the vendor branch is).
I think that should do it (modulo issues such as moving the file out of the
Attic).  And I can't see in which way that would make merging worse than it
is now.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]