[PATCH] Fix merge parent checking with svn.pushmergeinfo.
- From
Jason Merrill <jason@redhat.com>
- Date
- Sep 15, 2017, 17:08 UTC
- Message-ID
- <20170915170818.27390-1-jason@redhat.com>
Without this fix, svn dcommit of a merge with svn.pushmergeinfo set would get error messages like "merge parent <X> for <Y> is on branch svn+ssh://gcc.gnu.org/svn/gcc/trunk, which is not under the git-svn root svn+ssh://jason@gcc.gnu.org/svn/gcc!"
* git-svn.perl: Remove username from rooturl before comparing to branchurl.
Signed-off-by: Jason Merrill <jason@redhat.com> --- git-svn.perl | 1 + 1 file changed, 1 insertion(+)
diff --git a/git-svn.perl b/git-svn.perl index fa42364785..1663612b1c 100755 --- a/git-svn.perl +++ b/git-svn.perl @@ -931,6 +931,7 @@ sub cmd_dcommit { # information from different SVN repos, and paths # which are not underneath this repository root. my $rooturl = $gs->repos_root; + Git::SVN::remove_username ($rooturl); foreach my $d (@$linear_refs) { my %parentshash; read_commit_parents(\%parentshash, $d);
-- 2.13.5