On Mon, Apr 6, 2015 at 6:21 PM, Thomas Kopp <tkopp_at_vertere.com> wrote:
>
> Last week we merged our production branch into the open issue branches we
have. There were no conflicts and only a few files changed in most cases.
>
> Today after changes in two of the open branches, I copied the production
branch to a new Next Release branch, checked it out to my local machine,
then attempted to merge the two open branches into the local copy. The
test merge listed a number of tree conflicts and other potential conflicts,
and when I try to do an actual merge it transfers some data then gives a
path not found error with a revision number in the form:
>
> 'svn/[repository name]/!svn/rvr/[revision number]/[path to branch]' path
not found
>
I saw the same error message, when I had this situation:
1. Create branchA from trunk at revision 123
2. Do some work on branchA, up to revision 124
3. Revision 125 created on trunk
4. Merge revision 125 to branchA
5. Create branchB from revision 125 on trunk
6. Merge branchA to branchB as an automatic merge, by not specifying a
revision
I worked around this issue by specifying an explicit revision range in step
6 instead of doing an auto merge. But I'd certainly like to know what was
going on.
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3111129
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-04-07 04:50:59 CEST