git/list[1] front-page[2] threads[3] people[4] search[5] about
 

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

From
EWEric Wong <normalperson@yhbt.net>
Date
Mar 8, 2013, 09:53 UTC
Message-ID
<20130308095330.GA20205@dcvr.yhbt.net>
In-Reply-To
<000e01ce1b26$dbb65570$93230050$@certicon.cz>
Jan Pešta <jan.pesta@certicon.cz> wrote:
Show 10 quoted lines
> 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.pesta@certicon.cz>
Show 14 quoted lines
> ---
>  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 <normalperson@yhbt.net>
Previous: Jan PeštaNext: Eric Wong
Message 2 of 4 in “git svn: ignore partial svn:mergeinfo”
  1. git svn: ignore partial svn:mergeinfoJan Pešta, Mar 7, 2013
  2. Eric WongMar 8, 2013
  3. git svn: consistent spacing after "W:" in warningsEric Wong, Mar 8, 2013
  4. Junio C HamanoMar 8, 2013

Read the whole thread, see it on lore, or plain text.

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.