From: Martin Langhoff <martin.langhoff@gmail.com>
Date: Mon, 15 Aug 2005 20:09:02 GMT
Subject: Re: Switching heads and head vs branch after CVS import
Message-ID: <46a038f90508151309269ffc04@mail.gmail.com>
In-Reply-To: <Pine.LNX.4.58.0508150930020.3553@g5.osdl.org>

On 8/16/05, Linus Torvalds <torvalds@osdl.org> wrote:
> The good news is that if you guess wrong, and you claim a merge where none
> exists, it doesn't really do any real damage. 

I had figured out what part of the code I wanted to hack, but was
concerned that marking things that were merges in cvs-speak but not in
git-speak would leave me with broken import and problems going
forward.

If I find the time, I'll add some sort of pattern-match parameters to
be tried against the commitmsg to extract likely head/branch names
where we are merging from. My problem right now is that the only cvs
repo with interesting branches and merges I have is huge, and takes an
hour to import. That puts a damper on things, unfortunately.

cheers,


martin