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

Tree conflicts testable?

From: Dave Lawrence <dlawrence_at_ad-holdings.co.uk>
Date: Tue, 18 Nov 2008 12:21:04 +0000

I shall be running into a tree conflict later today. I have some files
that are moved and modified locally, and modified remotely.

Perhaps you could suggest whether the nightly builds yet in a state
where I could give tree conflicts a test drive.

I note this log message
"Note: resolving file tree conflicts doesn't work (yet?) because the
svn_client_resolve() API doesn't resolve those conflicts"
from 9th Nov.

Also it appears the latest build is dated 13th Nov

If you don't get back in time, or advise me not to try this yet, I'm
sure there will be plenty more opportunity to test this given the amount
of reorganisation going on in our repo at the moment.

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe_at_tortoisesvn.tigris.org
For additional commands, e-mail: users-help_at_tortoisesvn.tigris.org
Received on 2008-11-18 13:21:25 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.

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