Re: [Issue 2685] Move + Merge => lose modifications
From: Johan Corveleyn <jcorvel_at_gmail.com>
Date: Fri, 26 Aug 2011 14:32:31 +0200
On Fri, Aug 26, 2011 at 2:02 PM, Daniel Shahaf <d.s_at_daniel.shahaf.name> wrote:
No probs, you hadn't yet marked it fixed, so it's still open :-). You
I don't think this issue is made redundant by Stefan's work on support
At least the fundamental question is still there: wouldn't it be
OTOH, there might be other scenarios that get more difficult this way.
-- Johan >> Maybe there won't be data loss anymore, because a tree conflict will be flagged. >> But I think it's still reasonable to expect svn to resolve this automatically. >> >> Or, on a more fundamental level: there is something to be said for having merge >> "replay" a move on trunk into an equivalent move on the branch. If the source of >> the move doesn't exist on the branch, a tree conflict could be flagged. >> >> A consequence of this would be that "svn log" on "/BRANCH/TOMOVE/test.txt" >> follows a more logical path (i.e. it was copied from "/BRANCH/test.txt" (rather >> than from "/TRUNK/TOMOVE/test.txt), which could have had several interesting >> changes on the branch). >> >> I'm not sure if this would completely solve the "move + merge + modifications on >> branch" issue (cf. Lieven's scenario in #desc9), but it certainly feels more >> natural to me. >> >> So repurposing this issue into something like "Merge should apply moves/copies >> as equivalent operations relative to the branch" or something similar makes >> sense to me (or at least seriously investigate/analyze this approach). >> >> ------------------------------------------------------ >> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=463&dsMessageId=2830567 >> >> To unsubscribe from this discussion, e-mail: [issues-unsubscribe_at_subversion.tigris.org]. >Received on 2011-08-26 14:33:24 CEST
This is an archived mail posted to the Subversion Dev mailing list.