Suppose that I have a trunk with revisions from 1-30 (HEAD is 30th revision) and a branch which I create after I committed the 10th revision.
What are the differences among the 3 scenarios below:
1) Merge a range of revisions from 15-HEAD (as can be seen in the text box in the attached picture) to the branch
2) Merge the HEAD to the branch (the text box contains "HEAD")
3) No revision from the trunk is specified (the text box is empty)
From the description given on the dialog box, I would guess that
1) All changes in revisions 15, 16, ... 30 are merged into the branch.
2) Only revision 30 is merged into the branch.
3) Revisions 11, 12, ... 30 are merged into the branch (all revisions made since the branch was created at revision 10. (Though based on your text, the branch you created was probably revision 11 in which case the list of revisions to merge would start at 12).
Thanks for your reply.
I have another questions: How can I know which revisions I already merged to the branch? (In case I already forgot my activities in the past)
Thanks very much
To do a great right, do a little wrong - shakepeare. twisted little ad:
free, earth-friendly heat - a kickstarter for putting coin in your pocket while saving the earth