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

Re: [Issue 2685] Move + Merge => lose modifications

From: Stefan Sperling <stsp_at_elego.de>
Date: Mon, 29 Aug 2011 13:15:55 +0200

On Fri, Aug 26, 2011 at 04:00:15PM +0300, Daniel Shahaf wrote:
> I tested with rc1, and now with trunk, and in both cases a tree conflict
> is reported on the node that was modified on branch and
> modified+moved-away on trunk.
> >From Stefan's commit messages I expected the issue to be fixed on trunk.
> (Namely, I expected trunk to merge the text mods into the moved target;
> though, admittedly, the mods in my testing would have text-conflicted.)

It only works for uncommitted local moves so far, i.e. moves reported
by 'svn status'. We need copy-to on the server to handle comitted moves.
Received on 2011-08-29 13:16:56 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.