Hi,
I don't understand why you're merging the trunk back into the branch. I
asume you have a good reason to merge the bug fixes into the mainstream
development. In our case this is because we're anticipating the release of a
new version. Once the bug fixes are merged into the trunk, the branch can
die and a new branch will be started for bug fixes on the new version.
Kris.
> -----Original Message-----
> From: Kyle Hargraves [mailto:[EMAIL PROTECTED]]
> Sent: Wednesday, April 26, 2000 00:43
> To: [EMAIL PROTECTED]
> Subject: Branch tagging advice
>
>
> 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.
>
>
