[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Option to reintergrate a branch is missing from the merge dialoge

From: Ian L <misc_at_imerk.com>
Date: Fri, 30 Aug 2013 12:32:31 -0700 (PDT)

I have a working copy of a repo that i switched over to a new branch. I wanted to merge it back to trunk. Right clicked the folder, selected merge and the only options i have are Merge a range of revisions, or merge two different trees.

I do not have the option to reintergrate a branch. That option is just not displayed.

I'm using the latest version of tortoise (just updated it today, although it was not working with the previous version either). And i'm using version 2.5.9 of visual svn server. also just tried upgrading that to the 2.6.5 version but still only have the two options.

If I cant get the option to reintergrate, whats the best method for me to move this branch back to trunk? At this point the branch can basically just replace the trunk. But in the future I'd like to know how i can actually merge them.

Thank you


To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-08-30 21:32:35 CEST

This is an archived mail posted to the TortoiseSVN Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.