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

Re: Tree-conflicts branch - log message / review

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Wed, 03 Sep 2008 10:31:12 +0100

On Tue, 2008-09-02 at 21:18 +0100, Julian Foad wrote:
> I have written a complete log message of what is on the tree-conflicts
> branch compared with trunk. This is attached and also stored in
> README.branch in the root of the branch.
>
> The diff is available for a while at
> <http://filebin.ca/ajqeez/tc-r32853.patch>.

[...]

> * subversion/include/svn_wc.h
[...]
> (svn_wc_conflict_description_t): Add fields representing the
> operation
> resulting in a conflict, and the victim of a tree conflict.
[...]

> ### The 'victim_path' field is redundant. It should be removed and
> its use
> replaced by use of the basename of 'path'.

I have now done that, in r32866.

- Julian

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe_at_subversion.tigris.org
For additional commands, e-mail: dev-help_at_subversion.tigris.org
Received on 2008-09-03 11:31:37 CEST

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