{"thread":{"id":"23686","subject":"git-svn error: ambiguous argument","startedAt":"2010-05-03T20:51:09Z","lastAt":"2010-07-06T23:11:11Z","messageCount":8,"participants":["Paul Lindner","Bert Wesarg","Eric Wong"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"140848","messageId":"7A6370FC-843B-43FD-8064-4F44C9C66493@inuus.com","threadId":"23686","inReplyTo":null,"subject":"git-svn error: ambiguous argument","fromName":"Paul Lindner","fromEmail":"lindner@inuus.com","sentAt":"2010-05-03T20:51:09Z","receivedAt":"2010-05-03T20:51:09Z","isPatch":false,"sender":{"key":"lindner@inuus.com","avatar":null},"body":"Hi,\n\nSince the 1.7 time frame my git-svn imports have stopped working after a period of time.  The error that crops up is:\n\n  trace: built-in: git 'rev-list' '-1' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' 'd18d09558e4f56fb757b258cb364f38861f84116' '3f498379030b5358d65820415b98cbe338086247' '1e4ed9c6fde9e4b2465a8db6915f32a132634064'   'a51029a8667288556e02055057f250157e0a7f59' '0a7934d4a22563e29ed9857240bc022800f626f7' 'c6a0edb91eed10b86aad74c138422ff8a496ad29' 'd211954a973b92feef86aa130bf5ac253c095574' 'd9e99745569c8cd7d087cd8740f915b34f0f5fa2' '--not' 'd86892a76b3ef4049b87ca50f62846cdff5f204f'\n  trace: built-in: git 'rev-list' '-1' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' 'd18d09558e4f56fb757b258cb364f38861f84116' '3f498379030b5358d65820415b98cbe338086247' '--not' 'd86892a76b3ef4049b87ca50f62846cdff5f204f'\n  trace: built-in: git 'rev-list' '-1' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' '--not' 'd86892a76b3ef4049b87ca50f62846cdff5f204f'\n  trace: built-in: git 'merge-base' 'd86892a76b3ef4049b87ca50f62846cdff5f204f' 'cb612e24c7d15ff8b4b13822592fff25e1efff13'\n  trace: built-in: git 'rev-list' '--no-merges' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' '--not' '23dfc0fd04cedd8e09c2bfa6f0e79e9a4282bc57'\n  trace: built-in: git 'rev-list' 'dde42274ac34e4055275ea4926cd8cc259476399^..4ff8e8528dd9d3901c6839080a6f172b8e380764' \n  fatal: ambiguous argument 'dde42274ac34e4055275ea4926cd8cc259476399^..4ff8e8528dd9d3901c6839080a6f172b8e380764': unknown revision or path not in the working tree.\n  Use '--' to separate paths from revisions\n  rev-list dde42274ac34e4055275ea4926cd8cc259476399^..4ff8e8528dd9d3901c6839080a6f172b8e380764: command returned error: 128\n\nThis git-svn repo is a shallow clone of a very large svn repo.\n\nIt was initialized like this:\n\n  git svn init SVNREPO --trunk=network/trunk --branches=network/branches --tags=network/tagz --ignore-paths='^.+/(?:branches)/(?!BR_ENG_PLFM|BR_REL)' network\n  git svn fetch -r 112002 \n\nIt appears that one of the branches cannot find it's parent:\n\n git log dde42274ac34e4055275ea4926cd8cc259476399^\n\nfails.\n\nAny ideas or workarounds would be very welcome.\n\nThanks!\n"},{"id":"141479","messageId":"AANLkTik_YK6_KbRIq4MsrU-LDn8apHQfm1_f7XHKKfX1@mail.gmail.com","threadId":"23686","inReplyTo":"7A6370FC-843B-43FD-8064-4F44C9C66493@inuus.com","subject":"Re: git-svn error: ambiguous argument","fromName":"Bert Wesarg","fromEmail":"bert.wesarg@googlemail.com","sentAt":"2010-05-11T14:25:41Z","receivedAt":"2010-05-11T14:25:41Z","isPatch":false,"sender":{"key":"bert.wesarg@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/111934?v=4"},"body":"On Mon, May 3, 2010 at 22:51, Paul Lindner <lindner@inuus.com> wrote:\n> Hi,\n>\n> Since the 1.7 time frame my git-svn imports have stopped working after a period of time.  The error that crops up is:\n>\n>  trace: built-in: git 'rev-list' '-1' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' 'd18d09558e4f56fb757b258cb364f38861f84116' '3f498379030b5358d65820415b98cbe338086247' '1e4ed9c6fde9e4b2465a8db6915f32a132634064'   'a51029a8667288556e02055057f250157e0a7f59' '0a7934d4a22563e29ed9857240bc022800f626f7' 'c6a0edb91eed10b86aad74c138422ff8a496ad29' 'd211954a973b92feef86aa130bf5ac253c095574' 'd9e99745569c8cd7d087cd8740f915b34f0f5fa2' '--not' 'd86892a76b3ef4049b87ca50f62846cdff5f204f'\n>  trace: built-in: git 'rev-list' '-1' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' 'd18d09558e4f56fb757b258cb364f38861f84116' '3f498379030b5358d65820415b98cbe338086247' '--not' 'd86892a76b3ef4049b87ca50f62846cdff5f204f'\n>  trace: built-in: git 'rev-list' '-1' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' '--not' 'd86892a76b3ef4049b87ca50f62846cdff5f204f'\n>  trace: built-in: git 'merge-base' 'd86892a76b3ef4049b87ca50f62846cdff5f204f' 'cb612e24c7d15ff8b4b13822592fff25e1efff13'\n>  trace: built-in: git 'rev-list' '--no-merges' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' '--not' '23dfc0fd04cedd8e09c2bfa6f0e79e9a4282bc57'\n>  trace: built-in: git 'rev-list' 'dde42274ac34e4055275ea4926cd8cc259476399^..4ff8e8528dd9d3901c6839080a6f172b8e380764'\n>  fatal: ambiguous argument 'dde42274ac34e4055275ea4926cd8cc259476399^..4ff8e8528dd9d3901c6839080a6f172b8e380764': unknown revision or path not in the working tree.\n>  Use '--' to separate paths from revisions\n>  rev-list dde42274ac34e4055275ea4926cd8cc259476399^..4ff8e8528dd9d3901c6839080a6f172b8e380764: command returned error: 128\n>\n> This git-svn repo is a shallow clone of a very large svn repo.\n>\n> It was initialized like this:\n>\n>  git svn init SVNREPO --trunk=network/trunk --branches=network/branches --tags=network/tagz --ignore-paths='^.+/(?:branches)/(?!BR_ENG_PLFM|BR_REL)' network\n>  git svn fetch -r 112002\n>\n> It appears that one of the branches cannot find it's parent:\n>\n>  git log dde42274ac34e4055275ea4926cd8cc259476399^\n\nThat hit me too. The first revision number is the root commit, which\ndoes not have any parents. Thats why the rev-list command fails.\n\nBert\n"},{"id":"141482","messageId":"AANLkTil7WdGZTtmwwK0kYPkK6-y4W5HKKLNdtkoI0riM@mail.gmail.com","threadId":"23686","inReplyTo":"AANLkTik_YK6_KbRIq4MsrU-LDn8apHQfm1_f7XHKKfX1@mail.gmail.com","subject":"Re: git-svn error: ambiguous argument","fromName":"Bert Wesarg","fromEmail":"bert.wesarg@googlemail.com","sentAt":"2010-05-11T14:46:53Z","receivedAt":"2010-05-11T14:46:53Z","isPatch":false,"sender":{"key":"bert.wesarg@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/111934?v=4"},"body":"On Tue, May 11, 2010 at 16:25, Bert Wesarg <bert.wesarg@googlemail.com> wrote:\n> On Mon, May 3, 2010 at 22:51, Paul Lindner <lindner@inuus.com> wrote:\n>> Hi,\n>>\n>> Since the 1.7 time frame my git-svn imports have stopped working after a period of time.  The error that crops up is:\n>>\n>>  trace: built-in: git 'rev-list' '-1' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' 'd18d09558e4f56fb757b258cb364f38861f84116' '3f498379030b5358d65820415b98cbe338086247' '1e4ed9c6fde9e4b2465a8db6915f32a132634064'   'a51029a8667288556e02055057f250157e0a7f59' '0a7934d4a22563e29ed9857240bc022800f626f7' 'c6a0edb91eed10b86aad74c138422ff8a496ad29' 'd211954a973b92feef86aa130bf5ac253c095574' 'd9e99745569c8cd7d087cd8740f915b34f0f5fa2' '--not' 'd86892a76b3ef4049b87ca50f62846cdff5f204f'\n>>  trace: built-in: git 'rev-list' '-1' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' 'd18d09558e4f56fb757b258cb364f38861f84116' '3f498379030b5358d65820415b98cbe338086247' '--not' 'd86892a76b3ef4049b87ca50f62846cdff5f204f'\n>>  trace: built-in: git 'rev-list' '-1' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' '--not' 'd86892a76b3ef4049b87ca50f62846cdff5f204f'\n>>  trace: built-in: git 'merge-base' 'd86892a76b3ef4049b87ca50f62846cdff5f204f' 'cb612e24c7d15ff8b4b13822592fff25e1efff13'\n>>  trace: built-in: git 'rev-list' '--no-merges' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' '--not' '23dfc0fd04cedd8e09c2bfa6f0e79e9a4282bc57'\n>>  trace: built-in: git 'rev-list' 'dde42274ac34e4055275ea4926cd8cc259476399^..4ff8e8528dd9d3901c6839080a6f172b8e380764'\n>>  fatal: ambiguous argument 'dde42274ac34e4055275ea4926cd8cc259476399^..4ff8e8528dd9d3901c6839080a6f172b8e380764': unknown revision or path not in the working tree.\n>>  Use '--' to separate paths from revisions\n>>  rev-list dde42274ac34e4055275ea4926cd8cc259476399^..4ff8e8528dd9d3901c6839080a6f172b8e380764: command returned error: 128\n>>\n>> This git-svn repo is a shallow clone of a very large svn repo.\n>>\n>> It was initialized like this:\n>>\n>>  git svn init SVNREPO --trunk=network/trunk --branches=network/branches --tags=network/tagz --ignore-paths='^.+/(?:branches)/(?!BR_ENG_PLFM|BR_REL)' network\n>>  git svn fetch -r 112002\n>>\n>> It appears that one of the branches cannot find it's parent:\n>>\n>>  git log dde42274ac34e4055275ea4926cd8cc259476399^\n>\n> That hit me too. The first revision number is the root commit, which\n> does not have any parents. Thats why the rev-list command fails.\n\nI think the correct useage should be\n\n    git rev-list dde42274ac34e4055275ea4926cd8cc259476399^!\n4ff8e8528dd9d3901c6839080a6f172b8e380764\n\nMaking a patch for this doesn't look trivial, because git-svn expects\nthat a commit range is only one argument, not two in this case.\n\nBert\n"},{"id":"141484","messageId":"AANLkTimE6Wo9HT0p5WMfTggJ059dhDg4fyPeax93VCLy@mail.gmail.com","threadId":"23686","inReplyTo":"AANLkTil7WdGZTtmwwK0kYPkK6-y4W5HKKLNdtkoI0riM@mail.gmail.com","subject":"Re: git-svn error: ambiguous argument","fromName":"Bert Wesarg","fromEmail":"bert.wesarg@googlemail.com","sentAt":"2010-05-11T16:20:44Z","receivedAt":"2010-05-11T16:20:44Z","isPatch":false,"sender":{"key":"bert.wesarg@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/111934?v=4"},"body":"On Tue, May 11, 2010 at 16:46, Bert Wesarg <bert.wesarg@googlemail.com> wrote:\n> On Tue, May 11, 2010 at 16:25, Bert Wesarg <bert.wesarg@googlemail.com> wrote:\n>> On Mon, May 3, 2010 at 22:51, Paul Lindner <lindner@inuus.com> wrote:\n>>> Hi,\n>>>\n>>> Since the 1.7 time frame my git-svn imports have stopped working after a period of time.  The error that crops up is:\n>>>\n>>>  trace: built-in: git 'rev-list' '-1' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' 'd18d09558e4f56fb757b258cb364f38861f84116' '3f498379030b5358d65820415b98cbe338086247' '1e4ed9c6fde9e4b2465a8db6915f32a132634064'   'a51029a8667288556e02055057f250157e0a7f59' '0a7934d4a22563e29ed9857240bc022800f626f7' 'c6a0edb91eed10b86aad74c138422ff8a496ad29' 'd211954a973b92feef86aa130bf5ac253c095574' 'd9e99745569c8cd7d087cd8740f915b34f0f5fa2' '--not' 'd86892a76b3ef4049b87ca50f62846cdff5f204f'\n>>>  trace: built-in: git 'rev-list' '-1' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' 'd18d09558e4f56fb757b258cb364f38861f84116' '3f498379030b5358d65820415b98cbe338086247' '--not' 'd86892a76b3ef4049b87ca50f62846cdff5f204f'\n>>>  trace: built-in: git 'rev-list' '-1' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' '--not' 'd86892a76b3ef4049b87ca50f62846cdff5f204f'\n>>>  trace: built-in: git 'merge-base' 'd86892a76b3ef4049b87ca50f62846cdff5f204f' 'cb612e24c7d15ff8b4b13822592fff25e1efff13'\n>>>  trace: built-in: git 'rev-list' '--no-merges' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' '--not' '23dfc0fd04cedd8e09c2bfa6f0e79e9a4282bc57'\n>>>  trace: built-in: git 'rev-list' 'dde42274ac34e4055275ea4926cd8cc259476399^..4ff8e8528dd9d3901c6839080a6f172b8e380764'\n>>>  fatal: ambiguous argument 'dde42274ac34e4055275ea4926cd8cc259476399^..4ff8e8528dd9d3901c6839080a6f172b8e380764': unknown revision or path not in the working tree.\n>>>  Use '--' to separate paths from revisions\n>>>  rev-list dde42274ac34e4055275ea4926cd8cc259476399^..4ff8e8528dd9d3901c6839080a6f172b8e380764: command returned error: 128\n>>>\n>>> This git-svn repo is a shallow clone of a very large svn repo.\n>>>\n>>> It was initialized like this:\n>>>\n>>>  git svn init SVNREPO --trunk=network/trunk --branches=network/branches --tags=network/tagz --ignore-paths='^.+/(?:branches)/(?!BR_ENG_PLFM|BR_REL)' network\n>>>  git svn fetch -r 112002\n>>>\n>>> It appears that one of the branches cannot find it's parent:\n>>>\n>>>  git log dde42274ac34e4055275ea4926cd8cc259476399^\n>>\n>> That hit me too. The first revision number is the root commit, which\n>> does not have any parents. Thats why the rev-list command fails.\n>\n> I think the correct useage should be\n>\n>    git rev-list dde42274ac34e4055275ea4926cd8cc259476399^!\n> 4ff8e8528dd9d3901c6839080a6f172b8e380764\n>\n> Making a patch for this doesn't look trivial, because git-svn expects\n> that a commit range is only one argument, not two in this case.\n\nCan you try this patch, it worked on my site:\n\ndiff --git a/git-svn.perl b/git-svn.perl\nindex b3b6964..40ecec0 100755\n--- a/git-svn.perl\n+++ b/git-svn.perl\n@@ -3103,7 +3095,11 @@ sub check_cherry_pick {\n \tmy %commits = map { $_ => 1 }\n \t\t_rev_list(\"--no-merges\", $tip, \"--not\", $base);\n \tfor my $range ( @ranges ) {\n-\t\tdelete @commits{_rev_list($range)};\n+\t\tif ( $range =~ /^([[:xdigit:]]{40})\\^\\.\\.([[:xdigit:]]{40})$/i ) {\n+\t\t\tdelete @commits{_rev_list(sprintf(\"%s^!\", $1), $2)};\n+\t\t} else {\n+\t\t\tdelete @commits{_rev_list($range)};\n+\t\t}\n \t}\n \tfor my $commit (keys %commits) {\n \t\tif (has_no_changes($commit)) {\n\nBert\n"},{"id":"141490","messageId":"0D702391-E490-4942-AAB6-C8C887E671C5@inuus.com","threadId":"23686","inReplyTo":"AANLkTimE6Wo9HT0p5WMfTggJ059dhDg4fyPeax93VCLy@mail.gmail.com","subject":"Re: git-svn error: ambiguous argument","fromName":"Paul Lindner","fromEmail":"lindner@inuus.com","sentAt":"2010-05-11T19:44:07Z","receivedAt":"2010-05-11T19:44:07Z","isPatch":false,"sender":{"key":"lindner@inuus.com","avatar":null},"body":"This fixed it for my situation.  Thanks!\n\nOn May 11, 2010, at 9:20 AM, Bert Wesarg wrote:\n\n> On Tue, May 11, 2010 at 16:46, Bert Wesarg <bert.wesarg@googlemail.com> wrote:\n>> On Tue, May 11, 2010 at 16:25, Bert Wesarg <bert.wesarg@googlemail.com> wrote:\n>>> On Mon, May 3, 2010 at 22:51, Paul Lindner <lindner@inuus.com> wrote:\n>>>> Hi,\n>>>> \n>>>> Since the 1.7 time frame my git-svn imports have stopped working after a period of time.  The error that crops up is:\n>>>> \n>>>>  trace: built-in: git 'rev-list' '-1' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' 'd18d09558e4f56fb757b258cb364f38861f84116' '3f498379030b5358d65820415b98cbe338086247' '1e4ed9c6fde9e4b2465a8db6915f32a132634064'   'a51029a8667288556e02055057f250157e0a7f59' '0a7934d4a22563e29ed9857240bc022800f626f7' 'c6a0edb91eed10b86aad74c138422ff8a496ad29' 'd211954a973b92feef86aa130bf5ac253c095574' 'd9e99745569c8cd7d087cd8740f915b34f0f5fa2' '--not' 'd86892a76b3ef4049b87ca50f62846cdff5f204f'\n>>>>  trace: built-in: git 'rev-list' '-1' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' 'd18d09558e4f56fb757b258cb364f38861f84116' '3f498379030b5358d65820415b98cbe338086247' '--not' 'd86892a76b3ef4049b87ca50f62846cdff5f204f'\n>>>>  trace: built-in: git 'rev-list' '-1' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' '--not' 'd86892a76b3ef4049b87ca50f62846cdff5f204f'\n>>>>  trace: built-in: git 'merge-base' 'd86892a76b3ef4049b87ca50f62846cdff5f204f' 'cb612e24c7d15ff8b4b13822592fff25e1efff13'\n>>>>  trace: built-in: git 'rev-list' '--no-merges' 'cb612e24c7d15ff8b4b13822592fff25e1efff13' '--not' '23dfc0fd04cedd8e09c2bfa6f0e79e9a4282bc57'\n>>>>  trace: built-in: git 'rev-list' 'dde42274ac34e4055275ea4926cd8cc259476399^..4ff8e8528dd9d3901c6839080a6f172b8e380764'\n>>>>  fatal: ambiguous argument 'dde42274ac34e4055275ea4926cd8cc259476399^..4ff8e8528dd9d3901c6839080a6f172b8e380764': unknown revision or path not in the working tree.\n>>>>  Use '--' to separate paths from revisions\n>>>>  rev-list dde42274ac34e4055275ea4926cd8cc259476399^..4ff8e8528dd9d3901c6839080a6f172b8e380764: command returned error: 128\n>>>> \n>>>> This git-svn repo is a shallow clone of a very large svn repo.\n>>>> \n>>>> It was initialized like this:\n>>>> \n>>>>  git svn init SVNREPO --trunk=network/trunk --branches=network/branches --tags=network/tagz --ignore-paths='^.+/(?:branches)/(?!BR_ENG_PLFM|BR_REL)' network\n>>>>  git svn fetch -r 112002\n>>>> \n>>>> It appears that one of the branches cannot find it's parent:\n>>>> \n>>>>  git log dde42274ac34e4055275ea4926cd8cc259476399^\n>>> \n>>> That hit me too. The first revision number is the root commit, which\n>>> does not have any parents. Thats why the rev-list command fails.\n>> \n>> I think the correct useage should be\n>> \n>>    git rev-list dde42274ac34e4055275ea4926cd8cc259476399^!\n>> 4ff8e8528dd9d3901c6839080a6f172b8e380764\n>> \n>> Making a patch for this doesn't look trivial, because git-svn expects\n>> that a commit range is only one argument, not two in this case.\n> \n> Can you try this patch, it worked on my site:\n> \n> diff --git a/git-svn.perl b/git-svn.perl\n> index b3b6964..40ecec0 100755\n> --- a/git-svn.perl\n> +++ b/git-svn.perl\n> @@ -3103,7 +3095,11 @@ sub check_cherry_pick {\n> \tmy %commits = map { $_ => 1 }\n> \t\t_rev_list(\"--no-merges\", $tip, \"--not\", $base);\n> \tfor my $range ( @ranges ) {\n> -\t\tdelete @commits{_rev_list($range)};\n> +\t\tif ( $range =~ /^([[:xdigit:]]{40})\\^\\.\\.([[:xdigit:]]{40})$/i ) {\n> +\t\t\tdelete @commits{_rev_list(sprintf(\"%s^!\", $1), $2)};\n> +\t\t} else {\n> +\t\t\tdelete @commits{_rev_list($range)};\n> +\t\t}\n> \t}\n> \tfor my $commit (keys %commits) {\n> \t\tif (has_no_changes($commit)) {\n> \n> Bert\n"},{"id":"144367","messageId":"AANLkTikKdDI_NMzvsA7e_VoYo7Ie97e2pBkZe_0xPt9P@mail.gmail.com","threadId":"23686","inReplyTo":"0D702391-E490-4942-AAB6-C8C887E671C5@inuus.com","subject":"Re: git-svn error: ambiguous argument","fromName":"Bert Wesarg","fromEmail":"bert.wesarg@googlemail.com","sentAt":"2010-06-28T06:03:01Z","receivedAt":"2010-06-28T06:03:01Z","isPatch":false,"sender":{"key":"bert.wesarg@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/111934?v=4"},"body":"On Tue, May 11, 2010 at 21:44, Paul Lindner <lindner@inuus.com> wrote:\n> This fixed it for my situation.  Thanks!\n>\n> On May 11, 2010, at 9:20 AM, Bert Wesarg wrote:\n>\n>>\n>> Can you try this patch, it worked on my site:\n>>\n>> diff --git a/git-svn.perl b/git-svn.perl\n>> index b3b6964..40ecec0 100755\n>> --- a/git-svn.perl\n>> +++ b/git-svn.perl\n>> @@ -3103,7 +3095,11 @@ sub check_cherry_pick {\n>>       my %commits = map { $_ => 1 }\n>>               _rev_list(\"--no-merges\", $tip, \"--not\", $base);\n>>       for my $range ( @ranges ) {\n>> -             delete @commits{_rev_list($range)};\n>> +             if ( $range =~ /^([[:xdigit:]]{40})\\^\\.\\.([[:xdigit:]]{40})$/i ) {\n>> +                     delete @commits{_rev_list(sprintf(\"%s^!\", $1), $2)};\n>> +             } else {\n>> +                     delete @commits{_rev_list($range)};\n>> +             }\n>>       }\n>>       for my $commit (keys %commits) {\n>>               if (has_no_changes($commit)) {\n\nEric, have you picked this up, or should I re-send it as a propper patch?\n\nBert\n"},{"id":"144369","messageId":"20100628062409.GA13203@dcvr.yhbt.net","threadId":"23686","inReplyTo":"AANLkTikKdDI_NMzvsA7e_VoYo7Ie97e2pBkZe_0xPt9P@mail.gmail.com","subject":"Re: git-svn error: ambiguous argument","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2010-06-28T06:24:09Z","receivedAt":"2010-06-28T06:24:09Z","isPatch":false,"sender":{"key":"e@80x24.org","avatar":null},"body":"Bert Wesarg <bert.wesarg@googlemail.com> wrote:\n> On Tue, May 11, 2010 at 21:44, Paul Lindner <lindner@inuus.com> wrote:\n> > This fixed it for my situation.  Thanks!\n> > On May 11, 2010, at 9:20 AM, Bert Wesarg wrote:\n> >> Can you try this patch, it worked on my site:\n\n<snip>\n\n> Eric, have you picked this up, or should I re-send it as a propper patch?\n\nA proper patch + commit message would be easier, thanks Bert!\n\n-- \nEric Wong\n"},{"id":"144968","messageId":"AANLkTilv1RywImw4RM3jMZl6YTawGhvodlhnX4RN1RWo@mail.gmail.com","threadId":"23686","inReplyTo":"20100628062409.GA13203@dcvr.yhbt.net","subject":"Re: git-svn error: ambiguous argument","fromName":"Bert Wesarg","fromEmail":"bert.wesarg@googlemail.com","sentAt":"2010-07-06T23:11:11Z","receivedAt":"2010-07-06T23:11:11Z","isPatch":false,"sender":{"key":"bert.wesarg@googlemail.com","avatar":"https://avatars.githubusercontent.com/u/111934?v=4"},"body":"On Mon, Jun 28, 2010 at 08:24, Eric Wong <normalperson@yhbt.net> wrote:\n> Bert Wesarg <bert.wesarg@googlemail.com> wrote:\n>> On Tue, May 11, 2010 at 21:44, Paul Lindner <lindner@inuus.com> wrote:\n>> > This fixed it for my situation.  Thanks!\n>> > On May 11, 2010, at 9:20 AM, Bert Wesarg wrote:\n>> >> Can you try this patch, it worked on my site:\n>\n> <snip>\n>\n>> Eric, have you picked this up, or should I re-send it as a propper patch?\n>\n> A proper patch + commit message would be easier, thanks Bert!\n\nI have invested some time to verify my patch before sending. And I\nthink I will break something. The current patch changes the range\nargument for git rev-list from \"r1^..r2\" to \"r1^!\" & \"r2\", which\nshould not be the same, because \"r1^..r2\" is equivalent to \"^r1^\" &\n\"r2\". This reads 'all commits reachable from r2 but not reachable from\nthe parent of r1' where my conversion should read 'all reachable from\nr1 (excluding all of its parents) or reachable from r2'. But maybe the\n'excluding all of its parents'-part quarantines that the semantic\nstill holds?\n\nAt least test 5 of t9151-svn-mergeinfo.sh does not pass, so my patch\nproved to be wrong.\n\nBert\n\n>\n> --\n> Eric Wong\n>\n"}]}