{"thread":{"id":"33099","subject":"[PATCH] git svn: ignore partial svn:mergeinfo","startedAt":"2013-03-07T11:28:14Z","lastAt":"2013-03-08T16:06:44Z","messageCount":4,"participants":["Jan Pešta","Eric Wong","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"210764","messageId":"000e01ce1b26$dbb65570$93230050$@certicon.cz","threadId":"33099","inReplyTo":null,"subject":"[PATCH] git svn: ignore partial svn:mergeinfo","fromName":"Jan Pešta","fromEmail":"jan.pesta@certicon.cz","sentAt":"2013-03-07T11:28:14Z","receivedAt":"2013-03-07T11:28:14Z","isPatch":true,"sender":{"key":"jan.pesta@certicon.cz","avatar":"https://avatars.githubusercontent.com/u/5998957?v=4"},"body":"Currently this is cosmetic change - the merges are ignored, becuase the methods \n(lookup_svn_merge, find_rev_before, find_rev_after) are failing on comparing text with number.\n\nSee 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 '*' suffix 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 has had this range merged into it.\n\nSigned-off-by: Jan Pesta \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":"210824","messageId":"20130308095330.GA20205@dcvr.yhbt.net","threadId":"33099","inReplyTo":"000e01ce1b26$dbb65570$93230050$@certicon.cz","subject":"Re: [PATCH] git svn: ignore partial svn:mergeinfo","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2013-03-08T09:53:30Z","receivedAt":"2013-03-08T09:53:30Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Jan Pešta wrote:\n> Currently this is cosmetic change - the merges are ignored, becuase the methods \n> (lookup_svn_merge, find_rev_before, find_rev_after) are failing on comparing text with number.\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 '*' 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 has had this range merged into it.\n> \n> Signed-off-by: Jan Pesta \n\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\nThanks,\n\nI've pushed this with a minor formatting change (added space after\n\"W:\") will push another change for formatting existing warnings more\nconsistently.\n\nSigned-off-by: Eric Wong \n"},{"id":"210825","messageId":"20130308100152.GA32643@dcvr.yhbt.net","threadId":"33099","inReplyTo":"20130308095330.GA20205@dcvr.yhbt.net","subject":"[PATCH] git svn: consistent spacing after \"W:\" in warnings","fromName":"Eric Wong","fromEmail":"normalperson@yhbt.net","sentAt":"2013-03-08T10:01:52Z","receivedAt":"2013-03-08T10:01:52Z","isPatch":true,"sender":{"key":"e@80x24.org","avatar":null},"body":"Eric Wong wrote:\n> will push another change for formatting existing warnings more\n> consistently.\n\n Just pushed. My master is sitting at git://git.bogomips.org/git-svn.git\n commit eae6cf5aa8ae2d8a90a99bbe4aeb01c29e01fd02\n\n Eric Wong (1):\n git svn: consistent spacing after \"W:\" in warnings\n\n Jan Pešta (1):\n git svn: ignore partial svn:mergeinfo\n\n I don't have further updates planned, maybe others do.\n----------------------------8<------------------------------\nFrom eae6cf5aa8ae2d8a90a99bbe4aeb01c29e01fd02 Mon Sep 17 00:00:00 2001\nFrom: Eric Wong \nDate: Fri, 8 Mar 2013 09:46:41 +0000\nSubject: [PATCH] git svn: consistent spacing after \"W:\" in warnings\n\nAll other instances of \"W:\"-prefixed warning messages have a space after\nthe \"W:\" to help with readability.\n\nSigned-off-by: Eric Wong \n---\n perl/Git/SVN.pm | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm\nindex 46aeb85..5273ee8 100644\n--- a/perl/Git/SVN.pm\n+++ b/perl/Git/SVN.pm\n@@ -1504,7 +1504,7 @@ sub lookup_svn_merge {\n \t\tmy $top_commit = $gs->find_rev_before( $top, 1, $bottom );\n \n \t\tunless ($top_commit and $bottom_commit) {\n-\t\t\twarn \"W:unknown path/rev in svn:mergeinfo \"\n+\t\t\twarn \"W: unknown path/rev in svn:mergeinfo \"\n \t\t\t\t.\"dirprop: $source:$range\\n\";\n \t\t\tnext;\n \t\t}\n-- \nEric Wong\n"},{"id":"210836","messageId":"7vfw05ho4r.fsf@alter.siamese.dyndns.org","threadId":"33099","inReplyTo":"20130308100152.GA32643@dcvr.yhbt.net","subject":"Re: [PATCH] git svn: consistent spacing after \"W:\" in warnings","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2013-03-08T16:06:44Z","receivedAt":"2013-03-08T16:06:44Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Eric Wong writes:\n\n> Eric Wong wrote:\n>> will push another change for formatting existing warnings more\n>> consistently.\n>\n> Just pushed. My master is sitting at git://git.bogomips.org/git-svn.git\n> commit eae6cf5aa8ae2d8a90a99bbe4aeb01c29e01fd02\n\nThanks.\n\n>\n> Eric Wong (1):\n> git svn: consistent spacing after \"W:\" in warnings\n>\n> Jan Pešta (1):\n> git svn: ignore partial svn:mergeinfo\n>\n> I don't have further updates planned, maybe others do.\n> ----------------------------8<------------------------------\n> From eae6cf5aa8ae2d8a90a99bbe4aeb01c29e01fd02 Mon Sep 17 00:00:00 2001\n> From: Eric Wong \n> Date: Fri, 8 Mar 2013 09:46:41 +0000\n> Subject: [PATCH] git svn: consistent spacing after \"W:\" in warnings\n>\n> All other instances of \"W:\"-prefixed warning messages have a space after\n> the \"W:\" to help with readability.\n>\n> Signed-off-by: Eric Wong \n> ---\n> perl/Git/SVN.pm | 2 +-\n> 1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm\n> index 46aeb85..5273ee8 100644\n> --- a/perl/Git/SVN.pm\n> +++ b/perl/Git/SVN.pm\n> @@ -1504,7 +1504,7 @@ sub lookup_svn_merge {\n> \t\tmy $top_commit = $gs->find_rev_before( $top, 1, $bottom );\n> \n> \t\tunless ($top_commit and $bottom_commit) {\n> -\t\t\twarn \"W:unknown path/rev in svn:mergeinfo \"\n> +\t\t\twarn \"W: unknown path/rev in svn:mergeinfo \"\n> \t\t\t\t.\"dirprop: $source:$range\\n\";\n> \t\t\tnext;\n> \t\t}\n"}]}