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

AW: issue 3899 (copying conflict victims)

From: Markus Schaber <m.schaber_at_3s-software.com>
Date: Thu, 26 May 2011 14:27:02 +0200

Hi, Steven,

> Von: Stephen Butler [mailto:sbutler_at_elego.de]
> I've assigned issue 3899 "forbid wc-wc copy/move of conflict victims"
> to myself, but I think it needs a little more discussion.
> The basic idea is that the conflict data (including marker files)
> references to "their" version from the repository, which would be
> anywhere else in the working copy.
> In an issue comment, Philip says:
> Perhaps we should simply prohibit copies where a conflict exists?
> That would also solve another problem: actual-only node conflicts
> are not copied.
> Along those lines, I propose to forbid copy or moving:
> 1. any conflict victim (text, property, or tree)
> 2. any directory containing conflicted children
> 3. any child of a tree-conflicted directory

When I have a local added (moved, copied) directory which tree conflicts
on update with a remotely added directory, then I want to be able to
resolve the conflict by moving/renaming my local variant out of the way,
to allow the remote version to come in place.

As far as I understood your rule, you would forbid to move the tree
conflicted directory.

> These apply to the move/copy source only. Resolving a tree conflict
> require copying or moving an item /into/ a conflicted tree.
> Also, a property conflict on a directory should not prevent copying or
> moving the directory's children.
> Comments?

See above. :-)

> I have a simple solution for #1 above, and the beginning of a test.
> I'll commit them if I get a +1.

Best regards

Markus Schaber

We software Automation.

3S-Smart Software Solutions GmbH
Markus Schaber | Developer
Memminger Str. 151 | 87439 Kempten | Germany | Tel. +49-831-54031-0 |
Fax +49-831-54031-50

Email: m.schaber@3s-software.com | Web: http://www.3s-software.com
CoDeSys internet forum: http://forum.3s-software.com
Download CoDeSys sample projects:

Managing Directors: Dipl.Inf. Dieter Hess, Dipl.Inf. Manfred Werner |
Trade register: Kempten HRB 6186 | Tax ID No.: DE 167014915
Received on 2011-05-26 14:27:47 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.