Re: Help with branching.

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.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=2434972
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].