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

2013-03-01 Thread Jan Pešta
ta Cc: git@vger.kernel.org; 'Matthieu Moy' Subject: Re: [PATCH] In inproperly merges, the ranges contains additional character "*" Jan Pešta writes: > In inproperly merges, the ranges contains additional character "*". Thanks, but -ECANNOTPARSE. What are "inpro

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

2013-03-01 Thread Junio C Hamano
Jan Pešta writes: > In inproperly merges, the ranges contains additional character "*". Thanks, but -ECANNOTPARSE. What are "inproperly merges"? > 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 me

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

2013-03-01 Thread Jan Pešta
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