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

issue 3899 (copying conflict victims)

From: Stephen Butler <sbutler_at_elego.de>
Date: Thu, 26 May 2011 13:42:42 +0200

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) includes
references to "their" version from the repository, which would be invalid
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

These apply to the move/copy source only. Resolving a tree conflict
may 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.


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


Stephen Butler | Senior Consultant
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
tel: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
Received on 2011-05-26 13:43:17 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.