Skip to content

Commit

Permalink
git-svn: Avoid spurious errors when rewriteRoot is used.
Browse files Browse the repository at this point in the history
After doing a rebase, git-svn checks that the SVN URL
is what it expects. However, it does not account for
rewriteRoot, which is a legitimate way for the URL
to change. This produces a lot of spurious errors.

[ew: fixed line wrapping]

Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Acked-by: Eric Wong <normalperson@yhbt.net>
  • Loading branch information
Alexander Gavrilov authored and Eric Wong committed Oct 9, 2009
1 parent 8fd2cfa commit c03c1f7
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions git-svn.perl
Original file line number Diff line number Diff line change
Expand Up @@ -603,8 +603,15 @@ sub cmd_dcommit {
"\nBefore dcommitting";
}
if ($url_ ne $expect_url) {
fatal "URL mismatch after rebase: ",
"$url_ != $expect_url";
if ($url_ eq $gs->metadata_url) {
print
"Accepting rewritten URL:",
" $url_\n";
} else {
fatal
"URL mismatch after rebase:",
" $url_ != $expect_url";
}
}
if ($uuid_ ne $uuid) {
fatal "uuid mismatch after rebase: ",
Expand Down

0 comments on commit c03c1f7

Please sign in to comment.