more D/F conflict tests

diff --git a/git-svn.perl b/git-svn.perl
index 36709607f2d3865cea3b607851d8db478eebdf3a..650c9e5f02ead07351629d6572e82c3a9ac7ef92 100755 (executable)
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -663,7 +663,8 @@ sub cmd_branch {
        }
        $head ||= 'HEAD';
 
-       my ($src, $rev, undef, $gs) = working_head_info($head);
+       my (undef, $rev, undef, $gs) = working_head_info($head);
+       my $src = $gs->full_url;
 
        my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
        my $allglobs = $remote->{ $_tag ? 'tags' : 'branches' };
@@ -3163,7 +3164,8 @@ sub find_extra_svn_parents {
                                next unless $new_parents[$i];
                                next unless $new_parents[$j];
                                my $revs = command_oneline(
-                                       "rev-list", "-1", "$i..$j",
+                                       "rev-list", "-1",
+                                       "$new_parents[$i]..$new_parents[$j]",
                                       );
                                if ( !$revs ) {
                                        undef($new_parents[$i]);