[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: file obstruction upon merging an already merged added/moved file (#4649)

From: Stefan Hett <stefan_at_egosoft.com>
Date: Mon, 12 Sep 2016 07:36:23 +0200

On 9/10/2016 10:35 AM, Julian Foad wrote:
> Julian Foad wrote:
>> On 06/09/16, Stefan Hett wrote:
>>> What still is unclear to me is that SVN handles the case when I do an
>>> auto merge but not when using the cherry pick merge. [...]
>>
>> An auto merge doesn't try to merge back a revision that it can determine
>> has already been applied to the target branch.
>>
>>> Maybe it's best to have a quick look at this at Berlin, if time
>>> permits?
>>
>> Sorry, I can't come to Berlin this year [...]
>
> but I'm sure someone else will be glad to go through it with you.
>
k, I'll see to bring it up with someone there.

-- 
Regards,
Stefan Hett
Received on 2016-09-12 07:36:36 CEST

This is an archived mail posted to the Subversion Dev mailing list.