* [PATCH] git-svn: Avoid spurious errors when rewriteRoot is used.
@ 2009-10-09 7:01 Alexander Gavrilov
2009-10-09 8:34 ` Eric Wong
0 siblings, 1 reply; 3+ messages in thread
From: Alexander Gavrilov @ 2009-10-09 7:01 UTC (permalink / raw)
To: Eric Wong; +Cc: git
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.
Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
---
git-svn.perl | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/git-svn.perl b/git-svn.perl
index e0ec258..e9030ff 100755
--- a/git-svn.perl
+++ b/git-svn.perl
@@ -603,8 +603,12 @@ 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: ",
--
1.6.3.2.13.g94af7
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] git-svn: Avoid spurious errors when rewriteRoot is used.
2009-10-09 7:01 [PATCH] git-svn: Avoid spurious errors when rewriteRoot is used Alexander Gavrilov
@ 2009-10-09 8:34 ` Eric Wong
2009-10-09 20:44 ` Junio C Hamano
0 siblings, 1 reply; 3+ messages in thread
From: Eric Wong @ 2009-10-09 8:34 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Alexander Gavrilov
Alexander Gavrilov <angavrilov@gmail.com> wrote:
> 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.
>
> Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>
Thanks Alexander,
Acked-by: Eric Wong <normalperson@yhbt.net>
Fixed some line wrapping and pushed out to
git://git.bogomips.org/git-svn
--
Eric Wong
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH] git-svn: Avoid spurious errors when rewriteRoot is used.
2009-10-09 8:34 ` Eric Wong
@ 2009-10-09 20:44 ` Junio C Hamano
0 siblings, 0 replies; 3+ messages in thread
From: Junio C Hamano @ 2009-10-09 20:44 UTC (permalink / raw)
To: Eric Wong; +Cc: git, Alexander Gavrilov
Eric Wong <normalperson@yhbt.net> writes:
> Thanks Alexander,
>
> Acked-by: Eric Wong <normalperson@yhbt.net>
>
> Fixed some line wrapping and pushed out to
> git://git.bogomips.org/git-svn
Thanks.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2009-10-09 20:51 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-10-09 7:01 [PATCH] git-svn: Avoid spurious errors when rewriteRoot is used Alexander Gavrilov
2009-10-09 8:34 ` Eric Wong
2009-10-09 20:44 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).