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

Re: is it a wrong statement?

From: C. Michael Pilato <cmpilato_at_collab.net>
Date: 2006-03-20 17:08:55 CET

Kamesh Jayachandran wrote:
> Hi All,
> In subversion/libsvn_fs_base/notes/structure : Merging Algorithm section
> I could see the following line
> "If any of the three entries is of type file, declare a conflict." . I
> think it does not make sense.
> I think the next statement should be enough.

The merging algorithm is a *directory* merging algorithm. If asked to
perform a directory merging algorithm on inputs that are not all
directories, something is wrong, and yes, the code will declare a conflict.
 The text as written is correct, and should not be removed.

C. Michael Pilato <cmpilato@collab.net>
CollabNet   <>   www.collab.net   <>   Distributed Development On Demand

Received on Mon Mar 20 17:16:32 2006

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