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

Re: tree conflicts and directories discussion

From: Nico Schellingerhout <nico.schellingerhout_at_philips.com>
Date: Thu, 3 Apr 2008 08:57:47 +0200

Stefan Sperling <stsp_at_elego.de> wrote on 04/02/2008 07:46:17 PM:

> On Wed, Apr 02, 2008 at 07:29:53PM +0200, Stefan Sperling wrote:
> > ==========
> > USE CASE 1
> > ==========
> >
> > File:
> > If 'svn update' modifies a file that has been scheduled for deletion
> > in the working copy, the file is a tree conflict victim.
> >
> > Directory:
> > If 'svn update' modifies a file in a directory that has been scheduled
> > for deletion in the working copy, the directory is a tree conflict
victim.
>
> This would mean, of course, to mark the same conflict redundantly.
>
> Sorry.
>
> This should probably have been:
>
> If 'svn update' modifies a directory that has been scheduled for
> deletion in the working copy, the directory is a tree conflict victim.

Agreed.

>
> How do we define modification of a directory?
> Is a directory modified only when direct children are removed/added?
> Or are there other cases?

I think modification means: modification anywhere in the subtree
rooted by the directory under consideration, including properties
on that directory.

>
> > ==========
> > USE CASE 4
> > ==========
> >
> > Files:
> > If 'svn merge' tries to modify a file that does not exist in the
> > target working copy, then the target file is a tree conflict victim.
> >
> > Directories:
> > If 'svn merge' tries to modify a file in a directory that does not
exist
> > in the target working copy, then the target directory is a tree
> conflict victim.
>
> Same here:
>
> If 'svn merge' tries to modify a directory that does not exist in the
> target working copy, then the target directory is a tree conflict
victim.

Agreed.

- Nico
 
Received on 2008-04-03 08:56:43 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.