Re: [PATCH 2/2] git-svn: handle SVN merges from revisions past the tip of the branch

From: Sam Vilain <sam@vilain.net>
Date: Nov 13, 2009, 00:47 UTC
Message-ID: <4AFCAC9C.9020305@vilain.net>
In-Reply-To: <871vk35o86.fsf@navakl084.mitacad.com>

Toby Allsopp wrote:

Show 6 quoted lines

> When recording the revisions that it has merged, SVN sets the top
> revision to be the latest revision in the repository, which is not
> necessarily a revision on the branch that is being merged from.  When
> it is not on the branch, git-svn fails to add the extra parent to
> represent the merge because it relies on finding the commit on the
> branch that corresponds to the top of the SVN merge range.

I thought, "that sounds like he's repeating himself, wait a sec..."

> -test_expect_failure 'represent svn merges with intervening commits' "
> +test_expect_success 'represent svn merges with intervening commits' "
>  	[ `git cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
>  	"

So you made a failing test and then added the implementation for it? Interesting strategy :). I'd probably not repeat the same sentence twice though.

Thanks for contributing this. There might be other bugs too, especially when upstream has a more complicated merge hierarchy ... apparently svn tends to get it wrong, so checking for all commits might not work in that case.

It would be nice if "dcommit" could make these commits, too...

Sam