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

Re: [PATCH] Tree conflicts - revert and resolve per victim

From: Stephen Butler <sbutler_at_elego.de>
Date: Wed, 05 Nov 2008 21:18:04 +0100

Quoting Julian Foad <julianfoad_at_btopenworld.com>:

> Yes, I am. I'm implementing an augmented variant of walk_entries now,
> and then I'll make "resolve" and "revert" and "info" and "status" use
> it.

That's interesting. I hadn't thought that status could be done
using walk_entries, but if walk_entries is augmented for nonexistent
items, then status might as well use callbacks like the other

>> I'm working on svn resolve (your last item) currently. I
>> assume you're attacking this list from the top down.
> Steve, could you describe what you're aiming to make happen?

I'm trying to implement all of the resolve --accept options that
we outlined via email earlier in the week. I have a handy little
function that checks for and removes a tree conflict in one call.

/** If the item at @a victim_path is tree-conflicted, remove the tree
  * conflict state immediately and set @a was_present * to @c TRUE. If
  * the item has no tree conflict, set @a *was_present to @c FALSE. @a
  * adm_access is an admin access baton that can lock @a victim_path.
  * Use @a pool for all allocations.
  * @since New in 1.6.
svn_error_t *
svn_wc_remove_tree_conflict(svn_boolean_t *was_present,
                             const char *victim_path,
                             svn_wc_adm_access_t *adm_access,
                             apr_pool_t *pool);

It's a counterpart of the {get, add} functions we already have.
Note that it's not loggy, because resolve acts upon each conflicted
item immediately, IIUC.

Since I hadn't figured out a solution for the recursive case, as
you have, I haven't committed this yet. Though I suppose I can
commit this API function alone.


Stephen Butler | Software Developer
elego Software Solutions GmbH
Gustav-Meyer-Allee 25 | 13355 Berlin | Germany
fon: +49 30 2345 8696 | mobile: +49 163 25 45 015
fax: +49 30 2345 8695 | http://www.elegosoft.com
Geschäftsführer: Olaf Wagner | Sitz der Gesellschaft: Berlin
Amtsgericht Charlottenburg HRB 77719 | USt-IdNr: DE163214194
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-05 21:18:21 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.