RE: Re: Docs for reintegration unclear

Hey Bob,

>Generally, you will use Reintegrate. This is usually for the feature branch use case.
>In 1.8.x you don't have to make the choice, svn will figure it out for you.

I ran "merge reintegrate..." on my trunk working copy and it failed. It tried to merge some very old branch, one in fact that another developer had used.

Command Getting required information...
Command Merging https://<redacted>/svn/<projectName>/private/<differentDeveloper>/reports into O:\<projectName>, respecting ancestry
Error '/svn/<projectName>/!svn/rvr/667/private/<differentDeveloper>/reports' path not
Error found
Completed!

Yesterday when I mentioned I synchronized my branch with the trunk, the branch that got synchronized was something like https://<redacted>/svn/<projectName>/private/Marshall/bugfix12345

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-09-05 19:25:05 CEST