[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. Ce

[PATCH] GIT SVN

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.pe...@certicon.cz -Original Message

RE: [PATCH] GIT SVN

, March 01, 2013 1:29 PM To: Jan Pešta Cc: git@vger.kernel.org Subject: Re: [PATCH] GIT SVN Jan Pešta writes: > Sorry, > My fault :) > > Here is a patch atached. Still, please, read Documentation/SubmittingPatches. Your patch cannot be included as it is because of lack of sign-off.

[PATCH] In inproperly merges, the ranges contains additional character "*"

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 mergei

RE: [PATCH] In inproperly merges, the ranges contains additional character "*"

Hi Junio, You have right. But I think if there is a "*" sign, it should be skiped, instead of failing on comparing string with a number. I will prepare another patch. Regards, Jan Kind regards / S pozdravem Jan Pešta SW Engineer Sr. CertiCon a.s., www.certicon.cz Vaclavska 12 12

[PATCH] In partial SVN 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

[PATCH] git svn: ignore partial svn:mergeinfo

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 add

Updating not actual branch

Hi All, I have a question if there is a posibility tu update a branch which is not actual working copy. I have following situation: A - B - C - I - J master \ - D - E - F feature 1 \ G - H feature 2 (working