Re: Switching heads and head vs branch after CVS import

From: Matthias Urlichs <smurf@smurf.noris.de>
Date: Aug 15, 2005, 09:07 UTC
Message-ID: <pan.2005.08.15.09.07.10.118103@smurf.noris.de>
In-Reply-To: <Pine.LNX.4.58.0508141937251.3553@g5.osdl.org>

Hi, Linus Torvalds wrote:

Show 6 quoted lines

>> There may be some surprises in here! gitk --all shows at least one
>> branch opening and merging back into origin, and it has figured it out
>> correctly
>
> Oh, wow. The new cvsimport is obviously being a hell of a lot smarter
> than my original one was. Goodie.

Umm, actually, no, cvsimport doesn't do merges. Dunno where Martin got his from, but it wasn't me. ;-)

> Sven, Matthias, opinions? I've never used CVS keyword expansion, and 
> always felt it was pointless, but hey..

I have intentionally kept keyword expansion on when I wrote the code, because matching up the files from CVS with files gathered from tarballs, Debian repositories, and what-not, becomes a whole lot easier that way.

For me, that's a major use case, esp. with CVS getting confused about its tags (as people haphazardly copy whole subtrees from one CVS repository into a different one).

-- 
Matthias Urlichs   |   {M:U} IT Design @ m-u-it.de   |  smurf@smurf.noris.de
Disclaimer: The quote was selected randomly. Really. | http://smurf.noris.de
 - -
I hope you will find the courage to keep on living
despite the existence of this feature.

	-- Richard Stallman