{"thread":{"id":"21166","subject":"[PATCH] git-svn: Avoid spurious errors when rewriteRoot is used.","startedAt":"2009-10-09T07:01:04Z","lastAt":"2009-10-09T20:44:47Z","messageCount":3,"participants":["Alexander Gavrilov","Eric Wong","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"124435","messageId":"200910091101.04116.angavrilov@gmail.com","threadId":"21166","inReplyTo":null,"subject":"[PATCH] git-svn: Avoid spurious errors when rewriteRoot is used.","fromName":"Alexander Gavrilov","fromEmail":"angavrilov@gmail.com","sentAt":"2009-10-09T07:01:04Z","receivedAt":"2009-10-09T07:01:04Z","isPatch":true,"sender":{"key":"angavrilov@gmail.com","avatar":"https://avatars.githubusercontent.com/u/42666?v=4"},"body":"After doing a rebase, git-svn checks that the SVN URL\nis what it expects. However, it does not account for\nrewriteRoot, which is a legitimate way for the URL\nto change. This produces a lot of spurious errors.\n\nSigned-off-by: Alexander Gavrilov <angavrilov@gmail.com>\n---\n git-svn.perl |    8 ++++++--\n 1 files changed, 6 insertions(+), 2 deletions(-)\n\ndiff --git a/git-svn.perl b/git-svn.perl\nindex e0ec258..e9030ff 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -603,8 +603,12 @@ sub cmd_dcommit {\n \t\t\t\t\t  \"\\nBefore dcommitting\";\n \t\t\t\t}\n \t\t\t\tif ($url_ ne $expect_url) {\n-\t\t\t\t\tfatal \"URL mismatch after rebase: \",\n-\t\t\t\t\t      \"$url_ != $expect_url\";\n+\t\t\t\t\tif ($url_ eq $gs->metadata_url) {\n+\t\t\t\t\t\tprint \"Accepting rewritten URL: $url_\\n\";\n+\t\t\t\t\t} else {\n+\t\t\t\t\t\tfatal \"URL mismatch after rebase: \",\n+\t\t\t\t\t\t      \"$url_ != $expect_url\";\n+\t\t\t\t\t}\n \t\t\t\t}\n \t\t\t\tif ($uuid_ ne $uuid) {\n \t\t\t\t\tfatal \"uuid mismatch after rebase: \",\n-- \n1.6.3.2.13.g94af7\n"},{"id":"124440","messageId":"20091009083444.GA31594@dcvr.yhbt.net","threadId":"21166","inReplyTo":"200910091101.04116.angavrilov@gmail.com","subject":"Re: [PATCH] git-svn: Avoid spurious errors when rewriteRoot is used.","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2009-10-09T08:34:44Z","receivedAt":"2009-10-09T08:34:44Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Alexander Gavrilov <angavrilov@gmail.com> wrote:\n> After doing a rebase, git-svn checks that the SVN URL\n> is what it expects. However, it does not account for\n> rewriteRoot, which is a legitimate way for the URL\n> to change. This produces a lot of spurious errors.\n> \n> Signed-off-by: Alexander Gavrilov <angavrilov@gmail.com>\n\nThanks Alexander,\n\nAcked-by: Eric Wong <normalperson@yhbt.net>\n\nFixed some line wrapping and pushed out to\n  git://git.bogomips.org/git-svn\n\n-- \nEric Wong\n"},{"id":"124526","messageId":"7vy6nks3eo.fsf@alter.siamese.dyndns.org","threadId":"21166","inReplyTo":"20091009083444.GA31594@dcvr.yhbt.net","subject":"Re: [PATCH] git-svn: Avoid spurious errors when rewriteRoot is used.","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2009-10-09T20:44:47Z","receivedAt":"2009-10-09T20:44:47Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Wong <normalperson@yhbt.net> writes:\n\n> Thanks Alexander,\n>\n> Acked-by: Eric Wong <normalperson@yhbt.net>\n>\n> Fixed some line wrapping and pushed out to\n>   git://git.bogomips.org/git-svn\n\nThanks.\n"}]}