Hello.
I've just gotten fairly deep into using branches under CVS, and
have begun to run into tagging problems when merging either the
branch into the trunk or vice versa. When I try to think things
through, I end up with more question than when I began, so I
decided to turn here for some basic advice.
Let's assume my current project is 'proj', and it has a branch
named 'proj-bugfixes'. I need to keep both branches fairly up to
date with each other, as the bug fixes are important to have in
the trunk, and the branch needs the trunk changes to fix its
problems. So, I devised the following scheme:
When merging from the branch into the trunk, I would merge,
commit, and then tag the branch with the tag
'bugfixes-branch-into-trunk-1'. When merging the trunk into the
branch, I'd tag on the trunk with 'bugfixes-trunk-into-branch-1'.
Obviously, the number would increase with each merge. I tag at
each merge so I can use the 'double -j' update command.
The scheme seems to be working, but it strikes me as odd. How do
other people handle this situation? I'm afraid I'll run into a
problem soon, as I have little experience in this area, and would
like to eliminate any possible problems before they arise.
Any advice would be greatly appreciated.
Kyle
--
krh - [EMAIL PROTECTED]
and we all went mental and danced.
