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

Re: svn commit: r34117 - branches/tc-resolve

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 10 Nov 2008 12:19:53 +0000

On Mon, 2008-11-10 at 06:23 +0100, Neels J. Hofmeyr wrote:
>
> neels_at_tigris.org wrote:
> > Quoting julianf (mentioned patch will be checked in next):
> >
> > 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
> > behaviour.
>
> BTW, Julian, I haven't done anything about "svn revert" and "svn info". I've
> seen correctly that your patch doesn't do that yet, right?

That's right.

- Julian

> >
> > 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.
> >
> > Added:
> > branches/tc-resolve/ (props changed)
> > - copied from r34116, trunk/

---------------------------------------------------------------------
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-10 13:20:15 CET

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