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

Re: Tree conflicts testable?

From: Simon Large <simon.tortoisesvn_at_googlemail.com>
Date: Tue, 18 Nov 2008 13:03:53 +0000

2008/11/18 Dave Lawrence <dlawrence_at_ad-holdings.co.uk>:
> 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.

The nightly builds are down at the moment until Stefan gets a new hard
drive fitted.

Simon

-- 
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
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 14:04:03 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.