git-svn: Avoid spurious errors when rewriteRoot is used.
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>
Alexander Gavrilov committed
Oct 9, 2009 at 11:01 UTC
c03c1f798d5f865331428e88c7d19b15471d25a8
1 file changed
+9
-2
git-svn.perl
+9
-2
@@ -603,8 +603,15 @@ sub cmd_dcommit {
603
"\nBefore dcommitting";
604
}
605
if ($url_ ne $expect_url) {
606
- fatal "URL mismatch after rebase: ",
607
- "$url_ != $expect_url";
606
+ if ($url_ eq $gs->metadata_url) {
607
+ print
608
+ "Accepting rewritten URL:",
609
+ " $url_\n";
610
+ } else {
611
+ fatal
612
+ "URL mismatch after rebase:",
613
+ " $url_ != $expect_url";
614
+ }
615
}
616
if ($uuid_ ne $uuid) {
617
fatal "uuid mismatch after rebase: ",