Re: empty symlink detection breakage

From: Eric Wong <normalperson@yhbt.net>
Date: Feb 23, 2009, 04:33 UTC
Message-ID: <20090223043347.GA21136@dcvr.yhbt.net>
In-Reply-To: <20090222015611.GA14378@atjola.homenet>

Björn Steinbrink <B.Steinbrink@gmx.de> wrote:

> Hi Eric, 
> 
> seems that the empty symlink stuff gets confused about which revision to
> use when looking for the parent's file.

<snip>

> Note how it tries to look at revision 3 instead of revision 5 (which it
> correctly detected as the parent). The import succeeds when
> svn.brokenSymlinkWorkaround is set to false. Testcase below.

Thanks Björn,

I've pushed out a one line bugfix to git://git.bogomips.org/git-svn

diff --git a/git-svn.perl b/git-svn.perl
index ef01fb9..bce24a8 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -2421,6 +2421,7 @@ sub find_parent_branch {
 			# do_switch works with svn/trunk >= r22312, but that
 			# is not included with SVN 1.4.3 (the latest version
 			# at the moment), so we can't rely on it
+			$self->{last_rev} = $r0;
 			$self->{last_commit} = $parent;
 			$ed = SVN::Git::Fetcher->new($self, $gs->{path});
 			$gs->ra->gs_do_switch($r0, $rev, $gs,

-- 
Eric Wong