Re: Can

On Wed, Nov 13, 2013 at 5:17 AM, Mark Williams <mark_at_techop.co.uk> wrote:

> I am trying to merge some changes from a branch to the trunk. In the past
> some of the files have been moved from one directory to another. This move
> was successfully merged and checked in in the past.
>
> When I try to merge the new changes I am getting tree conflicts for the
> files that were deleted as part of the previous 'move'. If I try to select
> the conflict and resolve it I get an error saying the file does not exist!
>

I'm pretty sure this is a known issue sometimes referred to as the "evil
twin" bug, and I think it's a problem with the underlying SVN libraries
rather than TortoiseSVN. As I recall, you resolve it by just marking the
problem as resolved. (Please chime in someone if I'm wrong.) If you're
using the latest version of Tortoise, you may want to confirm that you get
the same problem with the command line tools. If you do get the same
problem, you could report it to the SVN lists. Good luck.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3068467

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-11-14 09:14:45 CET