
Fernando Cacciola wrote:
Hi,
I must be doing something wrong or I'm expecting something I shouldn't:
(1) I updated from the trunk (HEAD) (2) Fixed a couple of things (3) Commited to the trunk (4) Updated from RC_1_34 (over the same working folder)
Should be RC_1_34_0.
(5) Merged "merged_from_RC_1_34" and "HEAD" into working folder.
Should be merged_to_RC_1_34_0.
For step 5 I'm using ToroiseCVS 1.8.26 using the merge dialog as follow:
Start: merged_from_RC_1_34 End: HEAD
After that I get lots of updated, and even conflicted, files, way beside those which are mine.
Is that expected? I figured I would get only my files merged.
If it is, is it OK to just commit my files and not the others?
What about the tag?
I've never used TortoiseCVS, so I don't know. I use cvs and follow the release procedures described at http://boost.org/more/release_procedures.htm. I never merge more than the files I'm working on. Don't forget to "cvs tag" when you're done merging your changed into RC_1_34_0. -- Eric Niebler Boost Consulting www.boost-consulting.com