threads / patch / 22165

patch, 4 partsgit-svn: fix the trivial case of 'src and dst not in the same repo' during branch/tag

Subject: [PATCH 1/4] git-svn: fix the trivial case of 'src and dst not in the same repo' during branch/tag

## tl;dr

2 messages between Jan 11, 2010 and Jan 12, 2010. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Igor Mironov· Jan 11, 2010, 16:20 UTC · lore

This fixes the following issue:
$ git svn branch -t --username=svnuser --commit-url=https://myproj.domain.com/svn mytag
Copying http://myproj.domain.com/svn/trunk at r26 to https://myproj.domain.com/svn/tags/mytag...
Trying to use an unsupported feature: Source and dest appear not to be in the same repository (src: 'http://myproj.domain.com/svn/trunk'; dst: 'https://myproj.domain.com/svn/tags/mytag') at /usr/lib/git-core/git-svn line 623
Signed-off-by: Igor Mironov <igor.a.mironov@gmail.com>
---
 git-svn.perl |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

Show changes to git-svn.perl +4 −0

diff --git a/git-svn.perl b/git-svn.perl
index 650c9e5..3f7ccc1 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -710,6 +710,10 @@ sub cmd_branch {
 	my ($lft, $rgt) = @{ $glob->{path} }{qw/left right/};
 	my $dst = join '/', $remote->{url}, $lft, $branch_name, ($rgt || ());
 
+	if ($dst=~"^https:" && $src=~"^http:") {
+		$src=~s/^http:/https:/;
+	}
+
 	my $ctx = SVN::Client->new(
 		auth    => Git::SVN::Ra::_auth_providers(),
 		log_msg => sub {

-- 
1.6.6.106.ge2de8

Eric Wong· Jan 12, 2010, 04:27 UTC · re: Igor Mironov · lore

Re: [PATCH 1/4] git-svn: fix the trivial case of 'src and dst not in the same repo' during branch/tag

Igor Mironov <igor.a.mironov@gmail.com> wrote:

> This fixes the following issue:
> $ git svn branch -t --username=svnuser --commit-url=https://myproj.domain.com/svn mytag

Thanks Igor!

I've shorted the subject lines and line-wrapped the commit messages to fit in standard terminals, and pushed them out to: git://git.bogomips.org/git-svn

Igor Mironov (4):
      git-svn: fix mismatched src/dst errors for branch/tag
      git-svn: respect commiturl option for branch/tag
      git-svn: add --username/commit-url options for branch/tag
      git-svn: document --username/commit-url for branch/tag

I'll be working on dcommit error handling in a bit before asking Junio to pull.

-- 
Eric Wong