Re: [PATCH] git-svnimport: Improved detection of merges.

From: Eric Wong <normalperson@yhbt.net>
Date: Jun 1, 2006, 09:22 UTC
Message-ID: <20060601092238.GB9333@hand.yhbt.net>
In-Reply-To: <7vlkshs618.fsf@assigned-by-dhcp.cox.net>

Junio C Hamano <junkio@cox.net> wrote:

Show 14 quoted lines

> Florian Forster <octo@verplant.org> writes:
> 
> > The regexes detecting merges (while still relying on the commit messages,
> > though) have been improved to catch saner (and hopefully more) messages. The
> > old regex was so generic that it often matched something else and missed the
> > actual merge-message.
> 
> > Also, the regex given with the `-M' commandline-option is checked first:
> > Explicitely given regexes should be considered better than the builtin ones,
> > and should therefore be given a chance to match a message first.
> 
> The latter part sounds immensely sane.  The former I am not a
> good judge, since I do not interact with subversion repositories
> myself.  Opinions from real svn users?

Sounds sane to me, but I've not seen the patch from Florian.

I've been toying around a bit with enhanced branch/merge-tracking support in git-svn, too.

> 
> BTW, did anybody received the latest "What's in git.git" I sent
> out about 20 minutes ago?

Nope, I haven't seen that nor Florian's patch (assuming it was sent to the ml). Ah, I just saw (part #2) pop up.

-- 
Eric Wong