{"thread":{"id":"33044","subject":"[PATCH] GIT SVN","startedAt":"2013-03-01T12:24:58Z","lastAt":"2013-03-01T13:07:53Z","messageCount":4,"participants":["Jan Pešta","Matthieu Moy"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"210455","messageId":"000301ce1677$c9eb3f80$5dc1be80$@certicon.cz","threadId":"33044","inReplyTo":null,"subject":"[PATCH] GIT SVN","fromName":"Jan Pešta","fromEmail":"jan.pesta@certicon.cz","sentAt":"2013-03-01T12:24:58Z","receivedAt":"2013-03-01T12:24:58Z","isPatch":true,"sender":{"key":"jan.pesta@certicon.cz","avatar":"https://avatars.githubusercontent.com/u/5998957?v=4"},"body":"Sorry,\nMy fault :)\n\nHere is a patch atached.\n\nJan\n\nKind regards / S pozdravem\n \nJan Pešta\nSW Engineer Sr.\n\nCertiCon a.s., www.certicon.cz\nVaclavska 12\n12000 Prague 2\nCzech Republic\n \nOffice Prague: +420 224 904 406\nMobile: +420 604 794 306\n \nE-mail: jan.pesta@certicon.cz\n\n-----Original Message-----\nFrom: git-owner@vger.kernel.org [mailto:git-owner@vger.kernel.org] On Behalf\nOf Jan Pešta\nSent: Friday, March 01, 2013 11:29 AM\nTo: git@vger.kernel.org\nSubject: [PATCH]\n\nHi,\n\nI found a problem when using GIT-SVN.\n\nIn inproperly merges in SVN causes that the ranges contains additional\ncharacter \"*\". \n\nAttached patch fix this issue, I have it already tested for several months.\n\nRegards,\nJan\n\n\nKind regards / S pozdravem\n \n\nJan Pešta\nSW Engineer Sr.\n\nCertiCon a.s., www.certicon.cz\nVaclavska 12\n12000 Prague 2\nCzech Republic\n \nOffice Prague: +420 224 904 406\nMobile: +420 604 794 306\n \nE-mail: jan.pesta@certicon.cz\n\n\n--\nTo unsubscribe from this list: send the line \"unsubscribe git\" in the body\nof a message to majordomo@vger.kernel.org More majordomo info at\nhttp://vger.kernel.org/majordomo-info.html\n\n\ndiff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm\nindex 0ebc68a..6bd18e9 100644\n--- a/perl/Git/SVN.pm\n+++ b/perl/Git/SVN.pm\n@@ -1493,6 +1493,7 @@ sub lookup_svn_merge {\n \tmy @merged_commit_ranges;\n \t# find the tip\n \tfor my $range ( @ranges ) {\n+\t\t$range =~ s/[*]$//;\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"},{"id":"210456","messageId":"vpqsj4fmhgu.fsf@grenoble-inp.fr","threadId":"33044","inReplyTo":"000301ce1677$c9eb3f80$5dc1be80$@certicon.cz","subject":"Re: [PATCH] GIT SVN","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2013-03-01T12:29:05Z","receivedAt":"2013-03-01T12:29:05Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Jan Pešta writes:\n\n> Sorry,\n> My fault :)\n>\n> Here is a patch atached.\n\nStill, please, read Documentation/SubmittingPatches. Your patch cannot\nbe included as it is because of lack of sign-off.\n\nAlso, please write a commit message describing why this change is\nneeded. Where is this extra \"*\" comming from, and why do you need to\nremove it?\n\nThanks,\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"},{"id":"210457","messageId":"001001ce167c$0f376f10$2da64d30$@certicon.cz","threadId":"33044","inReplyTo":"vpqsj4fmhgu.fsf@grenoble-inp.fr","subject":"RE: [PATCH] GIT SVN","fromName":"Jan Pešta","fromEmail":"jan.pesta@certicon.cz","sentAt":"2013-03-01T12:55:32Z","receivedAt":"2013-03-01T12:55:32Z","isPatch":true,"sender":{"key":"jan.pesta@certicon.cz","avatar":"https://avatars.githubusercontent.com/u/5998957?v=4"},"body":"Hi again,\n\nFinally I created patch according to document.\n\nPlease have a look on referenced site for more details.\n\nCurrently I have a problems in our project, where SVN is main repository and\nmerge-info contains \"*\" which causes troubles in SVN.pm.\n\nRegards,\nJan\n\nKind regards / S pozdravem\n \nJan Pešta\nSW Engineer Sr.\n\nCertiCon a.s., www.certicon.cz\nVaclavska 12\n12000 Prague 2\nCzech Republic\n \nOffice Prague: +420 224 904 406\nMobile: +420 604 794 306\n \nE-mail: jan.pesta@certicon.cz\n\n\n-----Original Message-----\nFrom: Matthieu Moy [mailto:Matthieu.Moy@grenoble-inp.fr] \nSent: Friday, March 01, 2013 1:29 PM\nTo: Jan Pešta\nCc: git@vger.kernel.org\nSubject: Re: [PATCH] GIT SVN\n\nJan Pešta writes:\n\n> Sorry,\n> My fault :)\n>\n> Here is a patch atached.\n\nStill, please, read Documentation/SubmittingPatches. Your patch cannot be\nincluded as it is because of lack of sign-off.\n\nAlso, please write a commit message describing why this change is needed.\nWhere is this extra \"*\" comming from, and why do you need to remove it?\n\nThanks,\n\n--\nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n\n\n>From 03aefff110cc46a82e87c01fed38ac6bb22b353b Mon Sep 17 00:00:00 2001\nFrom: Jan Pesta \nDate: Fri, 1 Mar 2013 10:30:42 +0100\nSubject: [PATCH] In inproperly merges, the ranges contains additional\n character \"*\".\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---\n perl/Git/SVN.pm | 1 +\n 1 file changed, 1 insertion(+)\n\ndiff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm\nindex 0ebc68a..6bd18e9 100644\n--- a/perl/Git/SVN.pm\n+++ b/perl/Git/SVN.pm\n@@ -1493,6 +1493,7 @@ sub lookup_svn_merge {\n \tmy @merged_commit_ranges;\n \t# find the tip\n \tfor my $range ( @ranges ) {\n+\t\t$range =~ s/[*]$//;\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\n"},{"id":"210458","messageId":"vpqip5bmfo6.fsf@grenoble-inp.fr","threadId":"33044","inReplyTo":"001001ce167c$0f376f10$2da64d30$@certicon.cz","subject":"Re: [PATCH] GIT SVN","fromName":"Matthieu Moy","fromEmail":"matthieu.moy@grenoble-inp.fr","sentAt":"2013-03-01T13:07:53Z","receivedAt":"2013-03-01T13:07:53Z","isPatch":true,"sender":{"key":"matthieu.moy@grenoble-inp.fr","avatar":"https://gravatar.com/avatar/72c8a2705971a25dfaff23cece15130d405685845d911aedd5667ace277f3fc5?d=mp&s=160"},"body":"Jan Pešta writes:\n\n> Hi again,\n>\n> Finally I created patch according to document.\n\nThis is much better, but you still haven't taken into account some\nimportant parts of Documentation/SubmittingPatches (the part about\nattachments Vs inline patch, and the part about sign-off).\n\nThanks,\n\n-- \nMatthieu Moy\nhttp://www-verimag.imag.fr/~moy/\n"}]}