Re: Tree-conflicts branch - log message / review

> > Also, we need to choose a letter. T and C are already in use. How
> > about E?
>
> Like Mark said, E is in use too, but I can't see much problem with using
> "C" for either sort of Conflict. There will still be the concept of the
> four versions of the file (or directory): merge-left, merge-right, mine,
> working. The difference is just that, with a tree conflict, some of
> those versions might be nonexistent. OK that's not the _only_
> difference, but it is a largely similar situation.
>

If I'm not mistaken, 'T' is only used in the sixth column, and is free
for use in the first or second column?

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-08-22 09:52:16 CEST