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

[PATCH] Tree conflicts - revert and resolve per victim

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Tue, 04 Nov 2008 21:54:07 +0000

Tree conflict fans,

FYI, here is the patch I've been working on since yesterday to get
"revert" and "resolve" acting per victim.

The current state of progress is that "revert" works fully, and
"resolve" works for versioned victims but not for unversioned victims,
leaving no way of marking an unversioned victim as resolved.

TO DO: I want to make the recursion into unversioned victims be part of
svn_wc_walk_entries3(). In the present patch I just implemented it in
revert_internal() which does the recursion long-hand. The "resolve"
implementation, on the other hand, does use svn_wc_walk_entries3().

- 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-11-04 22:54:23 CET

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.