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

Re: Help with branching.

From: Ryan J Ollos <ryano_at_physiosonics.com>
Date: Tue, 5 Jan 2010 09:10:22 -0800 (PST)

Jen Pearson wrote:
> The other thing that has happened sometime was that I had a merge go
> haywire because I had to cancel it partway through and ended up having to
> delete two folders to get it back into a state where it would stop
> complaining about tree conflicts - I can't remember if this particular
> file in question was in one of those 2 folders.

I have seen similar behavior after canceling an update operation. In those
cases, the fix was to run an Update with the depth set to "fully recursive",
whereas the default depth was "working copy".

You might try making a copy of your working copy and running an update with
the depth set to "fully recursive".

For that matter, if you haven't already done so, I would recommend checking
out a fresh working copy from your branch.

View this message in context: http://old.nabble.com/Help-with-branching.-tp27024742p27026662.html
Sent from the tortoisesvn - users mailing list archive at Nabble.com.
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-01-05 18:10:55 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.