[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: Julian Foad <julian_at_foad.me.uk>
Date: Fri, 9 Sep 2016 22:02:21 +0100

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, and only occasionally check
mail and make a quick reply these days.

- Julian
Received on 2016-09-09 23:02:38 CEST

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