Re: Switching heads and head vs branch after CVS import

From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Aug 15, 2005, 09:48 UTC
Message-ID: <46a038f90508150248159e070e@mail.gmail.com>
In-Reply-To: <pan.2005.08.15.09.07.10.118103@smurf.noris.de>

On 8/15/05, Matthias Urlichs <smurf@smurf.noris.de> wrote:

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

Just wishful thinking, and a viewing things on a remote box over a slow x11-over-ssh connection. When I think about it, it doesn't seem possible either, so I better stop dreaming.

Show 6 quoted lines

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

Makes sense in that context. On the other hand, if you are you're migrating a project from cvs to git, getting rid of the noise is good.

And the resulting git repo will actually let you do trivial merges of old commits after you've switched -- otherwise every file-level merge will conflict, as it does in cvs when you don't use -kk.

cheers,

martin