{"thread":{"id":"33090","subject":"[PATCH] In partial SVN merges, the ranges contains additional character \"*\"","startedAt":"2013-03-06T21:35:46Z","lastAt":"2013-03-07T10:44:41Z","messageCount":3,"participants":["Jan Pešta","Junio C Hamano","Eric Wong"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"210722","messageId":"000001ce1ab2$903fbc40$b0bf34c0$@certicon.cz","threadId":"33090","inReplyTo":null,"subject":"[PATCH] In partial SVN merges, the ranges contains additional character \"*\"","fromName":"Jan Pešta","fromEmail":"jan.pesta@certicon.cz","sentAt":"2013-03-06T21:35:46Z","receivedAt":"2013-03-06T21:35:46Z","isPatch":true,"sender":{"key":"jan.pesta@certicon.cz","avatar":"https://avatars.githubusercontent.com/u/5998957?v=4"},"body":"See http://www.open.collab.net/community/subversion/articles/merge-info.html\nExtract:\nThe range r30430:30435 that was added to 1.5.x in this merge has a '*'\nsuffix for 1.5.x\\www.\nThis '*' is the marker for a non-inheritable mergeinfo range.\nThe '*' means that only the path on which the mergeinfo is explicitly set\nhas had this range merged into it.\n\nSigned-off-by: Jan Pesta <jan.pesta@certicon.cz>\n---\n perl/Git/SVN.pm | 5 +++++\n 1 file changed, 5 insertions(+)\n\ndiff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm\nindex 0ebc68a..74d49bb 100644\n--- a/perl/Git/SVN.pm\n+++ b/perl/Git/SVN.pm\n@@ -1493,6 +1493,11 @@ sub lookup_svn_merge {\n \tmy @merged_commit_ranges;\n \t# find the tip\n \tfor my $range ( @ranges ) {\n+\t\tif ($range =~ /[*]$/) {\n+\t\t\twarn \"W:Ignoring partial merge in svn:mergeinfo \"\n+\t\t\t\t.\"dirprop: $source:$range\\n\";\n+\t\t\tnext;\n+\t\t}\n \t\tmy ($bottom, $top) = split \"-\", $range;\n \t\t$top ||= $bottom;\n \t\tmy $bottom_commit = $gs->find_rev_after( $bottom, 1, $top );\n-- \n1.8.1.msysgit.1\n"},{"id":"210733","messageId":"7vppzcnkgu.fsf@alter.siamese.dyndns.org","threadId":"33090","inReplyTo":"000001ce1ab2$903fbc40$b0bf34c0$@certicon.cz","subject":"Re: [PATCH] In partial SVN merges, the ranges contains additional character \"*\"","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-03-07T00:04:49Z","receivedAt":"2013-03-07T00:04:49Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Jan Pešta <jan.pesta@certicon.cz> writes:\n\n> See http://www.open.collab.net/community/subversion/articles/merge-info.html\n> Extract:\n> The range r30430:30435 that was added to 1.5.x in this merge has a '*'\n> suffix for 1.5.x\\www.\n> This '*' is the marker for a non-inheritable mergeinfo range.\n> The '*' means that only the path on which the mergeinfo is explicitly set\n> has had this range merged into it.\n>\n> Signed-off-by: Jan Pesta <jan.pesta@certicon.cz>\n> ---\n>  perl/Git/SVN.pm | 5 +++++\n>  1 file changed, 5 insertions(+)\n>\n> diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm\n> index 0ebc68a..74d49bb 100644\n> --- a/perl/Git/SVN.pm\n> +++ b/perl/Git/SVN.pm\n> @@ -1493,6 +1493,11 @@ sub lookup_svn_merge {\n>  \tmy @merged_commit_ranges;\n>  \t# find the tip\n>  \tfor my $range ( @ranges ) {\n> +\t\tif ($range =~ /[*]$/) {\n> +\t\t\twarn \"W:Ignoring partial merge in svn:mergeinfo \"\n> +\t\t\t\t.\"dirprop: $source:$range\\n\";\n> +\t\t\tnext;\n> +\t\t}\n>  \t\tmy ($bottom, $top) = split \"-\", $range;\n>  \t\t$top ||= $bottom;\n>  \t\tmy $bottom_commit = $gs->find_rev_after( $bottom, 1, $top );\n"},{"id":"210760","messageId":"20130307104441.GA25337@dcvr.yhbt.net","threadId":"33090","inReplyTo":"000001ce1ab2$903fbc40$b0bf34c0$@certicon.cz","subject":"Re: [PATCH] In partial SVN merges, the ranges contains additional character \"*\"","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2013-03-07T10:44:41Z","receivedAt":"2013-03-07T10:44:41Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"(adding Sam to the Cc:, I rely on him for SVN merge knowledge)\n\nJan Pešta <jan.pesta@certicon.cz> wrote:\n> See http://www.open.collab.net/community/subversion/articles/merge-info.html\n> Extract:\n> The range r30430:30435 that was added to 1.5.x in this merge has a '*'\n> suffix for 1.5.x\\www.\n> This '*' is the marker for a non-inheritable mergeinfo range.\n> The '*' means that only the path on which the mergeinfo is explicitly set\n> has had this range merged into it.\n\nJan: can you write a better commit message to explain what your\npatch fixes/changes, and why we do it?\n\nSomething like:\n\n  Subject: [PATCH] git svn: ignore partial svn:mergeinfo\n\n  <explain why we ignore partial svn:mergeinfo in the body>\n\nSee Documentation/SubmittingPatches for hints.  Thanks!\n\n> Signed-off-by: Jan Pesta <jan.pesta@certicon.cz>\n> ---\n>  perl/Git/SVN.pm | 5 +++++\n>  1 file changed, 5 insertions(+)\n> \n> diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm\n> index 0ebc68a..74d49bb 100644\n> --- a/perl/Git/SVN.pm\n> +++ b/perl/Git/SVN.pm\n> @@ -1493,6 +1493,11 @@ sub lookup_svn_merge {\n>  \tmy @merged_commit_ranges;\n>  \t# find the tip\n>  \tfor my $range ( @ranges ) {\n> +\t\tif ($range =~ /[*]$/) {\n> +\t\t\twarn \"W:Ignoring partial merge in svn:mergeinfo \"\n> +\t\t\t\t.\"dirprop: $source:$range\\n\";\n> +\t\t\tnext;\n> +\t\t}\n>  \t\tmy ($bottom, $top) = split \"-\", $range;\n>  \t\t$top ||= $bottom;\n>  \t\tmy $bottom_commit = $gs->find_rev_after( $bottom, 1, $top );\n> -- \n"}]}