{"thread":{"id":"9956","subject":"[PATCH] git-svn: fix test for trunk svn (transaction out of date)","startedAt":"2007-09-21T02:02:32Z","lastAt":"2007-09-22T09:06:17Z","messageCount":9,"participants":["Sam Vilain","Eric Wong","Karl Hasselström"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"53691","messageId":"1190340155146-git-send-email-sam.vilain@catalyst.net.nz","threadId":"9956","inReplyTo":null,"subject":"[PATCH 0/3] git-svn: pass tests on svn trunk","fromName":"Sam Vilain","fromEmail":"sam.vilain@catalyst.net.nz","sentAt":"2007-09-21T02:02:32Z","receivedAt":"2007-09-21T02:02:32Z","isPatch":true,"sender":{"key":"sam@vilain.net","avatar":"https://gravatar.com/avatar/8fc840ca854dbf6f7065b4335e3b934951c1dca3b11db688e95e471901f8f4a8?d=mp&s=160"},"body":"While svn trunk is a dubious target to integrate with, perhaps these\npatches will prove useful to include anyway.\n\nTested against svn 1.4.2 and svn trunk r26724\n"},{"id":"53690","messageId":"11903401551014-git-send-email-sam.vilain@catalyst.net.nz","threadId":"9956","inReplyTo":"1190340155146-git-send-email-sam.vilain@catalyst.net.nz","subject":"[PATCH] git-svn: fix test for trunk svn (commit message not needed)","fromName":"Sam Vilain","fromEmail":"sam.vilain@catalyst.net.nz","sentAt":"2007-09-21T02:02:33Z","receivedAt":"2007-09-21T02:02:33Z","isPatch":true,"sender":{"key":"sam@vilain.net","avatar":"https://gravatar.com/avatar/8fc840ca854dbf6f7065b4335e3b934951c1dca3b11db688e95e471901f8f4a8?d=mp&s=160"},"body":"The 'svn mv -m \"rename to thunk\"' was a local operation, therefore not\nneeding a commit message, it was silently ignored. Newer svn clients will\ninstead raise an error.\n\nSigned-off-by: Sam Vilain \n---\n t/t9104-git-svn-follow-parent.sh | 3 +--\n 1 files changed, 1 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh\nindex d8f9cab..9eab945 100755\n--- a/t/t9104-git-svn-follow-parent.sh\n+++ b/t/t9104-git-svn-follow-parent.sh\n@@ -19,8 +19,7 @@ test_expect_success 'initialize repo' \"\n \tpoke trunk/readme &&\n \tsvn commit -m 'another commit' &&\n \tsvn up &&\n-\tsvn mv -m 'rename to thunk' trunk thunk &&\n-\tsvn up &&\n+\tsvn mv trunk thunk &&\n \techo goodbye >> thunk/readme &&\n \tpoke thunk/readme &&\n \tsvn commit -m 'bye now' &&\n-- \n1.5.2.4\n"},{"id":"53688","messageId":"11903401551812-git-send-email-sam.vilain@catalyst.net.nz","threadId":"9956","inReplyTo":"11903401551014-git-send-email-sam.vilain@catalyst.net.nz","subject":"[PATCH] git-svn: fix test for trunk svn (transaction out of date)","fromName":"Sam Vilain","fromEmail":"sam.vilain@catalyst.net.nz","sentAt":"2007-09-21T02:02:34Z","receivedAt":"2007-09-21T02:02:34Z","isPatch":true,"sender":{"key":"sam@vilain.net","avatar":"https://gravatar.com/avatar/8fc840ca854dbf6f7065b4335e3b934951c1dca3b11db688e95e471901f8f4a8?d=mp&s=160"},"body":"Older svn clients did not raise a 'transaction out of date' error here, but\ntrunk does - so 'svn up'.\n\nSigned-off-by: Sam Vilain \n---\n t/t9101-git-svn-props.sh | 1 +\n 1 files changed, 1 insertions(+), 0 deletions(-)\n\ndiff --git a/t/t9101-git-svn-props.sh b/t/t9101-git-svn-props.sh\nindex 622ea1c..5aac644 100755\n--- a/t/t9101-git-svn-props.sh\n+++ b/t/t9101-git-svn-props.sh\n@@ -140,6 +140,7 @@ test_expect_success 'test show-ignore' \"\n \tcd test_wc &&\n \tmkdir -p deeply/nested/directory &&\n \tsvn add deeply &&\n+\tsvn up &&\n \tsvn propset -R svn:ignore 'no-such-file*' .\n \tsvn commit -m 'propset svn:ignore'\n \tcd .. &&\n-- \n1.5.2.4\n"},{"id":"53689","messageId":"11903401552164-git-send-email-sam.vilain@catalyst.net.nz","threadId":"9956","inReplyTo":"11903401551812-git-send-email-sam.vilain@catalyst.net.nz","subject":"[PATCH] git-svn: handle changed svn command-line syntax","fromName":"Sam Vilain","fromEmail":"sam.vilain@catalyst.net.nz","sentAt":"2007-09-21T02:02:35Z","receivedAt":"2007-09-21T02:02:35Z","isPatch":true,"sender":{"key":"sam@vilain.net","avatar":"https://gravatar.com/avatar/8fc840ca854dbf6f7065b4335e3b934951c1dca3b11db688e95e471901f8f4a8?d=mp&s=160"},"body":"Previously, if you passed a revision and a path to svn, it meant to look\nback at that revision and select that path. New behaviour is to get the\npath then go back to the revision. The old syntax is selected with new\nsyntax PATH@REV. This new syntax is not supported by the old tools, so we\nhave to try both in turn.\n\nSigned-off-by: Sam Vilain \n---\n t/t9104-git-svn-follow-parent.sh | 6 ++++--\n 1 files changed, 4 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh\nindex 9eab945..7ba7630 100755\n--- a/t/t9104-git-svn-follow-parent.sh\n+++ b/t/t9104-git-svn-follow-parent.sh\n@@ -51,8 +51,10 @@ test_expect_success 'init and fetch from one svn-remote' \"\n \"\n \n test_expect_success 'follow deleted parent' \"\n- svn cp -m 'resurrecting trunk as junk' \\\n- -r2 $svnrepo/trunk $svnrepo/junk &&\n+ (svn cp -m 'resurrecting trunk as junk' \\\n+ $svnrepo/trunk@2 $svnrepo/junk ||\n+ svn cp -m 'resurrecting trunk as junk' \\\n+ -r2 $svnrepo/trunk $svnrepo/junk) &&\n git config --add svn-remote.svn.fetch \\\n junk:refs/remotes/svn/junk &&\n git-svn fetch -i svn/thunk &&\n-- \n1.5.2.4\n"},{"id":"53692","messageId":"46F33734.3080408@vilain.net","threadId":"9956","inReplyTo":"11903401552164-git-send-email-sam.vilain@catalyst.net.nz","subject":"Re: [PATCH] git-svn: handle changed svn command-line syntax","fromName":"Sam Vilain","fromEmail":"sam@vilain.net","sentAt":"2007-09-21T03:15:00Z","receivedAt":"2007-09-21T03:15:00Z","isPatch":true,"sender":{"key":"sam@vilain.net","avatar":"https://gravatar.com/avatar/8fc840ca854dbf6f7065b4335e3b934951c1dca3b11db688e95e471901f8f4a8?d=mp&s=160"},"body":"Sam Vilain wrote:\n> Previously, if you passed a revision and a path to svn, it meant to look\n> back at that revision and select that path. New behaviour is to get the\n> path then go back to the revision. The old syntax is selected with new\n> syntax PATH@REV. This new syntax is not supported by the old tools, so we\n> have to try both in turn.\n\nBlast, this analysis is wrong. Hold off, I'll see what's really going\non and re-submit.\n\nSam.\n\n> \n> Signed-off-by: Sam Vilain \n> ---\n> t/t9104-git-svn-follow-parent.sh | 6 ++++--\n> 1 files changed, 4 insertions(+), 2 deletions(-)\n> \n> diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh\n> index 9eab945..7ba7630 100755\n> --- a/t/t9104-git-svn-follow-parent.sh\n> +++ b/t/t9104-git-svn-follow-parent.sh\n> @@ -51,8 +51,10 @@ test_expect_success 'init and fetch from one svn-remote' \"\n> \"\n> \n> test_expect_success 'follow deleted parent' \"\n> - svn cp -m 'resurrecting trunk as junk' \\\n> - -r2 $svnrepo/trunk $svnrepo/junk &&\n> + (svn cp -m 'resurrecting trunk as junk' \\\n> + $svnrepo/trunk@2 $svnrepo/junk ||\n> + svn cp -m 'resurrecting trunk as junk' \\\n> + -r2 $svnrepo/trunk $svnrepo/junk) &&\n> git config --add svn-remote.svn.fetch \\\n> junk:refs/remotes/svn/junk &&\n> git-svn fetch -i svn/thunk &&\n"},{"id":"53693","messageId":"46F33A05.2000906@vilain.net","threadId":"9956","inReplyTo":"46F33734.3080408@vilain.net","subject":"Re: [PATCH] git-svn: handle changed svn command-line syntax","fromName":"Sam Vilain","fromEmail":"sam@vilain.net","sentAt":"2007-09-21T03:27:01Z","receivedAt":"2007-09-21T03:27:01Z","isPatch":true,"sender":{"key":"sam@vilain.net","avatar":"https://gravatar.com/avatar/8fc840ca854dbf6f7065b4335e3b934951c1dca3b11db688e95e471901f8f4a8?d=mp&s=160"},"body":"Sam Vilain wrote:\n> Sam Vilain wrote:\n>> Previously, if you passed a revision and a path to svn, it meant to look\n>> back at that revision and select that path. New behaviour is to get the\n>> path then go back to the revision. The old syntax is selected with new\n>> syntax PATH@REV. This new syntax is not supported by the old tools, so we\n>> have to try both in turn.\n> \n> Blast, this analysis is wrong. Hold off, I'll see what's really going\n> on and re-submit.\n\nok, figured it out :)\n\nI was close! I was just thrown off by 'svn ls PATH@REV'\n\nThe patch is the same, just the description has changed.\n\nSubject: [PATCH] git-svn: handle changed svn cp command-line syntax\n\nPreviously, if you passed a revision and a path to svn cp, it meant to look\nback at that revision and select that path. New behaviour is to get the\npath then go back to the revision (like other commands that accept @REV\nor -rREV do). The more consistent syntax is not supported by the old\ntools, so we have to try both in turn.\n---\n t/t9104-git-svn-follow-parent.sh | 6 ++++--\n 1 files changed, 4 insertions(+), 2 deletions(-)\n\ndiff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh\nindex 9eab945..7ba7630 100755\n--- a/t/t9104-git-svn-follow-parent.sh\n+++ b/t/t9104-git-svn-follow-parent.sh\n@@ -51,8 +51,10 @@ test_expect_success 'init and fetch from one svn-remote' \"\n \"\n \n test_expect_success 'follow deleted parent' \"\n- svn cp -m 'resurrecting trunk as junk' \\\n- -r2 $svnrepo/trunk $svnrepo/junk &&\n+ (svn cp -m 'resurrecting trunk as junk' \\\n+ $svnrepo/trunk@2 $svnrepo/junk ||\n+ svn cp -m 'resurrecting trunk as junk' \\\n+ -r2 $svnrepo/trunk $svnrepo/junk) &&\n git config --add svn-remote.svn.fetch \\\n junk:refs/remotes/svn/junk &&\n git-svn fetch -i svn/thunk &&\n-- \n1.5.3.2.3.g2f2dcc-dirty\n"},{"id":"53703","messageId":"20070921082348.GA5152@mayonaise","threadId":"9956","inReplyTo":"46F33A05.2000906@vilain.net","subject":"Re: [PATCH] git-svn: handle changed svn command-line syntax","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2007-09-21T08:23:48Z","receivedAt":"2007-09-21T08:23:48Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Sam Vilain wrote:\n> Sam Vilain wrote:\n> > Sam Vilain wrote:\n> >> Previously, if you passed a revision and a path to svn, it meant to look\n> >> back at that revision and select that path. New behaviour is to get the\n> >> path then go back to the revision. The old syntax is selected with new\n> >> syntax PATH@REV. This new syntax is not supported by the old tools, so we\n> >> have to try both in turn.\n> > \n> > Blast, this analysis is wrong. Hold off, I'll see what's really going\n> > on and re-submit.\n> \n> ok, figured it out :)\n> \n> I was close! I was just thrown off by 'svn ls PATH@REV'\n> \n> The patch is the same, just the description has changed.\n> \n> Subject: [PATCH] git-svn: handle changed svn cp command-line syntax\n> \n> Previously, if you passed a revision and a path to svn cp, it meant to look\n> back at that revision and select that path. New behaviour is to get the\n> path then go back to the revision (like other commands that accept @REV\n> or -rREV do). The more consistent syntax is not supported by the old\n> tools, so we have to try both in turn.\n\nThe @REV and -rREV distinction/ambiguity has always confused me in svn,\ntoo. It always seems that it needed to be one way sometimes, the other\nway at other times, and even _both_ at other times...\n\n-- \nEric Wong\n"},{"id":"53704","messageId":"20070921082724.GB5152@mayonaise","threadId":"9956","inReplyTo":"1190340155146-git-send-email-sam.vilain@catalyst.net.nz","subject":"Re: [PATCH 0/3] git-svn: pass tests on svn trunk","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2007-09-21T08:27:24Z","receivedAt":"2007-09-21T08:27:24Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Sam Vilain wrote:\n> While svn trunk is a dubious target to integrate with, perhaps these\n> patches will prove useful to include anyway.\n> \n> Tested against svn 1.4.2 and svn trunk r26724\n\nFine by me, as what's in trunk will likely be in a released version some\nday and I'm glad that people are already testing git-svn against it.\n\nThis series Acked-by: Eric Wong \n\n-- \nEric Wong\n"},{"id":"53798","messageId":"20070922090617.GA6817@diana.vm.bytemark.co.uk","threadId":"9956","inReplyTo":"20070921082348.GA5152@mayonaise","subject":"Re: [PATCH] git-svn: handle changed svn command-line syntax","fromName":"Karl Hasselström","fromEmail":"kha@treskal.com","sentAt":"2007-09-22T09:06:17Z","receivedAt":"2007-09-22T09:06:17Z","isPatch":true,"sender":{"key":"kha@treskal.com","avatar":"https://gravatar.com/avatar/f0120c734b5279b345075a28521e1ac66acb20c9913ffe9bf6ae97e53f7f3f13?d=mp&s=160"},"body":"On 2007-09-21 01:23:48 -0700, Eric Wong wrote:\n\n> The @REV and -rREV distinction/ambiguity has always confused me in svn,\n> too. It always seems that it needed to be one way sometimes, the other\n> way at other times, and even _both_ at other times...\n\n-rREV specifies the operative revision, and @REV specifies the peg\nrevision. See the clear but dreadfully long explanation here:\n\n http://svnbook.red-bean.com/en/1.4/svn.advanced.pegrevs.html\n\nIn short, it's a way to manage the complexity that comes from\nconsidering files (and directories!) to have an identity that is\npreserved across copies and renames.\n\n-- \nKarl Hasselström, kha@treskal.com\n www.treskal.com/kalle\n"}]}