Tree conflict with folder added on branch and trunk

I have a folder, "host", which contains Visual Studio projects.

On trunk, I added "host", and inside "host" added a subdirectory (call
it "lib") containing a visual studio project for the whole library.
There were a few other changes made to the library to get it building
on Windows.

Separately, on a feature branch from an earlier point in history, I
added "host" and inside "host" I added a subdirectory with a project
containing only a unit-test of the feature.

Now I am trying to get the "lib" changes onto my feature branch.

I tried doing a merge, but I get a tree conflict with "The last merge
operation tried to add the directory 'host', but the directory was
obstructed in the working copy." The only options are "Accept current
working copy state (mark as resolved)" and "Resolve later".

Choosing to accept current working copy state claims to do the adds of
the "lib" directory and its contents, but my working copy remains
unchanged, and there is nothing for the "lib" directory in the commit
dialog or check for modifications. This doesn't work to get the "lib"
directory at all.

So what can I do to resolve the conflict manually? Do I just svn copy
the "lib" directory into my working copy? I cannot find an option in
the repository browser to copy with history to my working copy. Do I
need to drop to the command-line for this operation?

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-08-05 17:57:51 CEST