git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jason Merrill <jason@redhat.com>
To: git@vger.kernel.org
Cc: Eric Wong <e@80x24.org>,
	aldyh@redhat.com, Jason Merrill <jason@redhat.com>
Subject: [PATCH] Fix merge parent checking with svn.pushmergeinfo.
Date: Fri, 15 Sep 2017 13:08:18 -0400	[thread overview]
Message-ID: <20170915170818.27390-1-jason@redhat.com> (raw)

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


             reply	other threads:[~2017-09-15 17:08 UTC|newest]

Thread overview: 7+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-09-15 17:08 Jason Merrill [this message]
2017-09-15 17:52 ` [PATCH] Fix merge parent checking with svn.pushmergeinfo Jonathan Nieder
2017-09-15 21:28   ` Jason Merrill
2017-09-15 21:46     ` [PATCH v2] git-svn: Fix svn.pushmergeinfo handling of svn+ssh usernames Jason Merrill
2017-09-15 21:54       ` Jonathan Nieder
2017-09-15 21:53     ` [PATCH] Fix merge parent checking with svn.pushmergeinfo Jonathan Nieder
2017-09-16  3:29       ` Jason Merrill

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20170915170818.27390-1-jason@redhat.com \
    --to=jason@redhat.com \
    --cc=aldyh@redhat.com \
    --cc=e@80x24.org \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).