Re: tree conflicts and directories discussion

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.

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

> ==========
> 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.

Thanks,

-- 
Stefan Sperling <stsp_at_elego.de>                 Software Developer
elego Software Solutions GmbH                            HRB 77719
Gustav-Meyer-Allee 25, Gebaeude 12        Tel:  +49 30 23 45 86 96 
13355 Berlin                              Fax:  +49 30 23 45 86 95
http://www.elego.de                 Geschaeftsfuehrer: Olaf Wagner