undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-svn: Avoid spurious errors when rewriteRoot is used.

Browse Source 
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>
This commit is contained in:
Alexander Gavrilov 2009-10-09 11:01:04 +04:00 committed by Eric Wong
parent 8fd2cfa7ac
commit c03c1f798d
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
git-svn.perl
View File

@ -603,8 +603,15 @@ sub cmd_dcommit {
"\nBefore dcommitting"; "\nBefore dcommitting";
} }
if ($url_ ne $expect_url) { if ($url_ ne $expect_url) {
fatal "URL mismatch after rebase: ", if ($url_ eq $gs->metadata_url) {
"$url_ != $expect_url"; print
"Accepting rewritten URL:",
" $url_\n";
} else {
fatal
"URL mismatch after rebase:",
" $url_ != $expect_url";
}
} }
if ($uuid_ ne $uuid) { if ($uuid_ ne $uuid) {
fatal "uuid mismatch after rebase: ", fatal "uuid mismatch after rebase: ",