On 05.08.2014 17:57, Ben Fritz wrote:
> 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.
"Accept current working copy state" does not claim to add anything, what
this means is that what you have in your working copy is accepted as
correct, and what should be merged is discarded. Exactly what it does.
> 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?
You should not have created the same folders in your branch as you did
on trunk. You should have merged the revision where you created those
folders on trunk from trunk to your branch. That way SVN knows that
those folders are related. Now, SVN does not know this and throws an
error telling you that the folders it tries to merge already exist.
Try the merge with the option "ignore ancestry", maybe that will the
merge to succeed (not sure though). Also try "force the merge".
See here for more info about ancestry:
http://svnbook.red-bean.com/nightly/en/svn.branchmerge.advanced.html#svn.branchmerge.advanced.ancestry
Stefan
--
___
oo // \\ "De Chelonian Mobile"
(_,\/ \_/ \ TortoiseSVN
\ \_/_\_/> The coolest interface to (Sub)version control
/_/ \_\ http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3086264
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-08-05 20:48:34 CEST