[PATCH] GIT SVN
- From
Jan Pešta <jan.pesta@certicon.cz>
- Date
- Mar 1, 2013, 12:24 UTC
- Message-ID
- <000301ce1677$c9eb3f80$5dc1be80$@certicon.cz>
Sorry, My fault :)
Here is a patch atached.
Jan
Kind regards / S pozdravem Jan Pešta SW Engineer Sr.
CertiCon a.s., www.certicon.cz Vaclavska 12 12000 Prague 2 Czech Republic Office Prague: +420 224 904 406 Mobile: +420 604 794 306 E-mail: jan.pesta@certicon.cz
-----Original Message----- From: git-owner@vger.kernel.org [mailto:git-owner@vger.kernel.org] On Behalf Of Jan Pešta Sent: Friday, March 01, 2013 11:29 AM To: git@vger.kernel.org Subject: [PATCH]
Hi,
I found a problem when using GIT-SVN.
In inproperly merges in SVN causes that the ranges contains additional character "*".
Attached patch fix this issue, I have it already tested for several months.
Regards, Jan
Kind regards / S pozdravem
Jan Pešta SW Engineer Sr.
CertiCon a.s., www.certicon.cz Vaclavska 12 12000 Prague 2 Czech Republic Office Prague: +420 224 904 406 Mobile: +420 604 794 306 E-mail: jan.pesta@certicon.cz
-- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
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 );