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

Re: resolving tree conflicts

From: Julian Foad <julianfoad_at_btopenworld.com>
Date: Mon, 10 Nov 2008 20:06:37 +0000

On Mon, 2008-11-10 at 20:20 +0100, Stefan Küng wrote:
> Mark Phippard wrote:
> > On Mon, Nov 10, 2008 at 2:12 PM, Stefan Küng <tortoisesvn_at_gmail.com> wrote:
> >
> >> During the last few days I've implemented some UI in TSVN to help the
> >> user to detect and resolve tree conflicts. But I found that an 'svn
> >> resolve treeconflictedfile' does nothing. Looking through the code I can
> >> see that this is not yet implemented.
> >>
> >> Now I've seen talk about branching 1.6 this week. Would that mean that
> >> resolving tree conflicted files won't work in 1.6? If not, what would I
> >> have to do to mark such a conflicted file as resolved?
> >
> > It is in the TO-DO as a blocker.
> >
> > http://svn.collab.net/repos/svn/trunk/TODO-1.6
> >
> Thanks - I've only checked the notes/tree-conflicts folder for info,
> I'll make sure to look for a TODO file next time.


Also note that the present "svn resolved"/svn_client_resolved() can
resolve tree conflicts: if invoked on a directory, it resolves all tree
conflicts that have that directory as their parent directory.

That's not what we want so we're changing it to resolve just the one
tree conflict of which the target is the victim.

- 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-10 21:06:53 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.