Re: [PATCH] git svn: ignore partial svn:mergeinfo

2013-03-08 Thread Eric Wong 
Jan Pešta jan.pe...@certicon.cz wrote:
 Currently this is cosmetic change - the merges are ignored, becuase the 
 methods 
 (lookup_svn_merge, find_rev_before, find_rev_after) are failing on comparing 
 text with number.
 
 See http://www.open.collab.net/community/subversion/articles/merge-info.html
 Extract:
 The range r30430:30435 that was added to 1.5.x in this merge has a '*' suffix 
 for 1.5.x\www.
 This '*' is the marker for a non-inheritable mergeinfo range.
 The '*' means that only the path on which the mergeinfo is explicitly set has 
 had this range merged into it.
 
 Signed-off-by: Jan Pesta jan.pe...@certicon.cz

 ---
  perl/Git/SVN.pm | 5 +
  1 file changed, 5 insertions(+)
 
 diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
 index 0ebc68a..74d49bb 100644
 --- a/perl/Git/SVN.pm
 +++ b/perl/Git/SVN.pm
 @@ -1493,6 +1493,11 @@ sub lookup_svn_merge {
   my @merged_commit_ranges;
   # find the tip
   for my $range ( @ranges ) {
 + if ($range =~ /[*]$/) {
 + warn W:Ignoring partial merge in svn:mergeinfo 

Thanks,

I've pushed this with a minor formatting change (added space after
W:) will push another change for formatting existing warnings more
consistently.

Signed-off-by: Eric Wong normalper...@yhbt.net
--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH] git svn: ignore partial svn:mergeinfo

2013-03-07 Thread Jan Pešta 
Currently this is cosmetic change - the merges are ignored, becuase the methods 
(lookup_svn_merge, find_rev_before, find_rev_after) are failing on comparing 
text with number.

See http://www.open.collab.net/community/subversion/articles/merge-info.html
Extract:
The range r30430:30435 that was added to 1.5.x in this merge has a '*' suffix 
for 1.5.x\www.
This '*' is the marker for a non-inheritable mergeinfo range.
The '*' means that only the path on which the mergeinfo is explicitly set has 
had this range merged into it.

Signed-off-by: Jan Pesta jan.pe...@certicon.cz
---
 perl/Git/SVN.pm | 5 +
 1 file changed, 5 insertions(+)

diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 0ebc68a..74d49bb 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1493,6 +1493,11 @@ sub lookup_svn_merge {
my @merged_commit_ranges;
# find the tip
for my $range ( @ranges ) {
+   if ($range =~ /[*]$/) {
+   warn W:Ignoring partial merge in svn:mergeinfo 
+   .dirprop: $source:$range\n;
+   next;
+   }
my ($bottom, $top) = split -, $range;
$top ||= $bottom;
my $bottom_commit = $gs-find_rev_after( $bottom, 1, $top );
-- 
1.8.1.msysgit.1

--
To unsubscribe from this list: send the line unsubscribe git in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html