[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: Stefan Sperling <stsp_at_elego.de>
Date: Thu, 3 Apr 2008 13:06:42 +0200

On Thu, Apr 03, 2008 at 08:40:27AM +0200, Nico Schellingerhout wrote:
> Stefan Sperling <stsp_at_elego.de> wrote on 04/02/2008 07:29:53 PM:
> > ==========
> > USE CASE 5
> > ==========
> >
> > Files:
> > If 'svn merge' deletes an existing file, the file is a tree conflict
> > victim if its text is different from the corresponding file on the left
> > side of the merge source.
> >
> > Directories:
> > If 'svn merge' deletes an existing directory, the directory is a tree conflict
> > victim if its content is different from the corresponding directory
> > on the left
> > side of the merge source.
> >
> > Question here: What makes two directories "equal"? Do we need to consider
> > all subdirectories of a directory? Or should we keep it simple and only
> > consider direct children as in all the other cases?
> > Warning: The former might perform quite badly!
> I'm afraid the answer has to be: the former (see comment with use case 2).

Hi again Nico,

I think the questions regarding use case 2 and use case 5 are
different.

Use case 2: How do we define a modification of a directory?

Use case 5: How do we define equality between directories?

I've added further input to the use case 2 question in another mail
in this thread.

About the latter: I agree that to be absolutely sure about the equality
status of two directories, the subtrees of both directories need to
be compared completely.

> Performance may be bad, but should scale with the size of the tree being
> deleted, so that should be acceptable. (It doesn't happen every day that
> you rename your entire source tree.)

I'm currently investigating how we could do this.
I will try to provide more details later.

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

  • application/pgp-signature attachment: stored
Received on 2008-04-03 13:06:03 CEST

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