I have two branches DEVELOPPEMENT and DEVELOPPEMENT2.
I would like to merge DEVELOPPEMENT and DEVELOPPEMENT2 into a same branch but not in the HEAD yet.
How to do it with the Tortoise HMI? I cannot find any documentation on that.
Asked
Active
Viewed 1,227 times
2
Sathyajith Bhat
- 61,504
- 38
- 179
- 264
Maxbester
- 219
- 3
- 5
- 17
-
Cross posting isn't allowed. Please delete one of the questions. – Dave Feb 10 '14 at 15:30
-
This question appears to be [cross-posted](http://stackoverflow.com/questions/21680467/tortoise-cvs-merge-branches). Please don't do that. – Sathyajith Bhat Feb 10 '14 at 16:04
-
@Sathya I deleted the question from Stackoverflow. Is Superuser the best place to post it? – Maxbester Feb 10 '14 at 17:32
-
@Maxbester between the two, [so] is probably better choice.. let me know if you don't get any responses in few days, I'll migrate it for you. – Sathyajith Bhat Feb 10 '14 at 17:52
2 Answers
0
I don't have Tortise CVS, but the way to go about should be to switch your Working directory from HEAD to either DEVELOPPEMENT or DEVELOPPEMENT2
once switched, perform the merge, you should get the file in the same branch off which you're working. Then do the commit.
Sathyajith Bhat
- 61,504
- 38
- 179
- 264
-
Thanks for the help. However I don't understand the fields `Start`, `End` and `Bug`. – Maxbester Feb 11 '14 at 07:28
-
@Maxbester I believe start and end should mention the starting and ending revisions/branches which you want to merge. Bug is probably a comment which would get amended to commit message – Sathyajith Bhat Feb 11 '14 at 07:47
-
So start should be `DEVELOPPEMENT2` and end should be `DEVELOPPEMENT`? Or is it the other way around? – Maxbester Feb 11 '14 at 07:52
-
@max I think start should be the older one & end shoould be the new one. You can try, the merge won't commit it, so just go ahead with the merge & see if it's okay & then commmit it – Sathyajith Bhat Feb 11 '14 at 07:55
0
Source: c:\Program Files\TortoiseCVS\UserGuide_en.chm
Merging from a Branch When you are satisfied with the changes you have done on a branch, you may want those changes to be available on the head branch of development. Incorporating changes from one branch to another, is known as merging.
To merge from a branch, move your local copy to the branch you want to merge the changes into. See Selecting a Branch to Work On or Going Back to the Head Branch. Select the top level folder of the project. You can also select the exact folders and files that are part of the desired branch if you know this information. Right-click the on the selection, and choose CVS → Merge....
Merge Dialog You will then be presented with the Merge Dialog. Here you can enter the branch name in the Branch to merge from field you wish to merge. Click the OK button, and TortoiseCVS will now merged the branch specified into your local copy. Your changes will not be made on the server repository, until you commit your changes.
-
Anything that are not your own words should be contained within a quote – Ramhound Oct 07 '14 at 18:51