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

Re: Tree conflicts - problem handling when local directory is deleted

From: Stephen Butler <sbutler_at_elego.de>
Date: Thu, 22 Jan 2009 17:07:11 +0100

Quoting Mark Phippard <mphippard_at_collab.net>:

> On Thu, Jan 22, 2009 at 9:56 AM, Julian Foad
> <julianfoad_at_btopenworld.com> wrote:
>> FYI I'm just about to look at this.
>
> I added an svn info to the script to look at the tree conflict. The
> problem is that after running update the local revision in the WC for
> the folder is 1 when it should have been updated to 2 by the update
> command. So this is why it is out of date when you try to commit.
> When the tree conflict was created it should have still allowed the WC
> revision to be updated.

Turning off the skipping of tree conflict victims is pretty
straightforward, at least for this use case (#1 in
notes/tree-conflicts/detection.txt).

What should we do if the user runs update again without resolving the
existing tree conflict first? Skipping is not an option.

I suppose we could record a new tree conflict, possibly overwriting
an existing tree conflict. It could get confusing if the user
updates and raises a tree conflict in dir A, then later updates dir
A/B and raises a new conflict in A/B. Now there are two tree
conflicts in the same tree. This could happen in everyday situations
such as an interrupted update.

Does anyone see a problem with overwritten or redundant tree
conflicts?

Does anyone know a better way to handle tree conflicts without
skipping?

Steve

>
> Path: wc2/A/B/E
> URL: file:///Users/mphippard/tree-conflicts/repos/trunk/A/B/E
> Repository Root: file:///Users/mphippard/tree-conflicts/repos
> Repository UUID: fd889f68-59a4-4395-b512-2cc3d879576e
> Revision: 1
> Node Kind: directory
> Schedule: delete
> Last Changed Author: mphippard
> Last Changed Rev: 1
> Last Changed Date: 2009-01-22 10:02:16 -0500 (Thu, 22 Jan 2009)
> Tree conflict: local delete, incoming edit upon update
> Source left: (none)
> file:///Users/mphippard/tree-conflicts/repos/trunk/A/B/E_at_1
> Source right: (dir)
> file:///Users/mphippard/tree-conflicts/repos/trunk/A/B/E_at_2
>
>
> --
> Thanks
>
> Mark Phippard
> http://markphip.blogspot.com/
>
> ------------------------------------------------------
> http://subversion.tigris.org/ds/viewMessage.do?dsForumId=462&dsMessageId=1043236
>

-- 
Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +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 2009-01-22 17:07:28 CET

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