On Nov 8, 2005, at 9:14 AM, Ralf Stephan wrote:
While I already saw the (possible) benefits of tagging when a branch was made, I don't see what you mean, and how this relates to AC's problems which BTW don't show here. I intend not to continue the branch, maybe that was unclear.
Oh, no. That was clear.
The main thing is to document the merge from the branch back to the trunk. It's perhaps not a big deal at the moment, but months from now when people are trying to figure out how the pieces fit together, this then will be very helpful.
Ralf, while we wait for any comments, take a peek at what that would mean for your changes.
I do not see what you mean.
See what files you involved in merging, which revision on the branches and which revision on the trunks.
For example, I went on in to src/desktop.cpp
From reviewing it's log/tree view, I guessed that the end of the branch was merged in as 1.93 on the trunk. So... to tag each of those, I did:
$ cvs tag -r 1.189.2.19 mergeto_trunk_08Nov05 desktop.cpp T desktop.cpp
$ cvs tag -r 1.193 mergefrom_CXXIFICATION_VIEW_AND_WIDGET_08Nov05 desktop.cpp T desktop.cpp
The output with the "T" at the beginning of the line shows the file or directory being tagged. Now that the file had both "ends" of the merge tagged, we have a solid record of what happened. Also, tools like TkCVS will give a nice diagram listing all the connections. (TkCVS works under Linux, OS X and Windows, and I'd really suggest installing it for checking now and then, if nothing else)
Also, I'd gone in and tagged src/Makefile_insert and src/arc- context.cpp. You can see the simple case there.