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

Re: Tree-conflicts: pressing tasks?

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Sun, 09 Nov 2008 22:01:11 +0000

On Sun, 2008-11-09 at 02:43 +0100, Neels J Hofmeyr wrote:
> Hi Julian,
> do you have any urgent tasks that you would want me to help with before
> Wednesday?

It would be great if you could advance the per-victim semantics, by
making "svn resolved" work per victim.

I recommend first converting "svn revert" or "svn info" (or both) to use
svn_wc__walk_entries_and_tc(), and check that they still work, to prove
that that new walker function works. "svn revert" and "svn info"
currently both do their own recursion in order to get correct per-victim

Then convert "svn resolved" to use it. The attached patch mostly does
this, but there's still a problem with it trying to get the adm_access
for an unversioned dir, the same kind of error you pointed out for me a
few days ago. update_tests 15 shows that error ("warning: Directory
'[...]/A/D/G' is missing"). Another error shows up in
tree_conflict_tests.py 1: it fails to resolve a tree conflict.

- 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-09 23:01:44 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.