merging branches (CVS)

Hello

I created a branch (v3_8_0-branch), checked it out from cvs and made a change.
Now (and many times in the future) I want to merge this (and the following bugfixes) into the HEAD.

If I "compare with..." a file of the HEAD version, which I changed in the branch, I see the change.

But somehow the "merge with branch" function doesn't work. I always get the current HEAD version, but no changes from the branch :\

1 comment
Comment actions Permalink

You mean the "merge with branch" in the "Update Project" dialog? Do you update from the HEAD branch or from the v3_8_0-branch branch?

Bas

0

Please sign in to leave a comment.