From: "Jan Pešta" <jan.pesta@certicon.cz>
To: <git@vger.kernel.org>
Cc: "'Matthieu Moy'" <Matthieu.Moy@grenoble-inp.fr>
Subject: [PATCH] In inproperly merges, the ranges contains additional character "*"
Date: Fri, 1 Mar 2013 14:33:07 +0100 [thread overview]
Message-ID: <002101ce1681$4f261090$ed7231b0$@certicon.cz> (raw)
In inproperly merges, the ranges contains additional character "*".
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>
---
perl/Git/SVN.pm | 1 +
1 file changed, 1 insertion(+)
diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
index 0ebc68a..6bd18e9 100644
--- a/perl/Git/SVN.pm
+++ b/perl/Git/SVN.pm
@@ -1493,6 +1493,7 @@ sub lookup_svn_merge {
my @merged_commit_ranges;
# find the tip
for my $range ( @ranges ) {
+ $range =~ s/[*]$//;
my ($bottom, $top) = split "-", $range;
$top ||= $bottom;
my $bottom_commit = $gs->find_rev_after( $bottom, 1, $top );
--
1.8.1.msysgit.1
next reply other threads:[~2013-03-01 13:33 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-03-01 13:33 Jan Pešta [this message]
2013-03-01 17:54 ` [PATCH] In inproperly merges, the ranges contains additional character "*" Junio C Hamano
2013-03-01 21:37 ` Jan Pešta
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to='002101ce1681$4f261090$ed7231b0$@certicon.cz' \
--to=jan.pesta@certicon.cz \
--cc=Matthieu.Moy@grenoble-inp.fr \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).