提交 c03c1f79 编写于 作者: A Alexander Gavrilov 提交者: Eric Wong

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: NAlexander Gavrilov <angavrilov@gmail.com>
Acked-by: NEric Wong <normalperson@yhbt.net>
上级 8fd2cfa7
......@@ -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: ",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册