Re: Best/correct way to do this?

[Jim Hyslop]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

address@hidden wrote:
> cvs v1.11.18... (I know I may need to update!)
> 
[...]
> Here lies the problem - the new files that I added to the 
> trunk, foo1.h/.cpp, that were subsequently merged to my branch 
> do NOT have the t_br_prevcommit tag so CVS does NOT know how 
> to do the above branch-to-trunk merge. If I "move" my 
> t_br_prevcommit tag on the branch, I lose the "delta" 
> information on my original files.
> 
> What's the correct way to do this?

You should be able to tag rev 1.1 of the newly-added files with
t_br_prevcommit:

cvs tag -r 1.1 t_br_prevcommit

This, of course, will not move any tags that already exist. The merge
should then go smoothly.

If you want to try the feature version, I think you can specify the base
of a branch like this:

cvs tag -r b_mybranch.base t_br_prevcommit

- --
Jim Hyslop
Dreampossible: Better software. Simply.     http://www.dreampossible.ca
                 Consulting * Mentoring * Training in
    C/C++ * OOD * SW Development & Practices * Version Management
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.2 (MingW32)
Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org

iD8DBQFEhiidLdDyDwyJw+MRAvqmAKCBikejpmej2xVpIDcVcLUxTE1bsgCgv5Sg
Jnt7UDmM7XGJgtF74SPOcis=
=drNc
-----END PGP SIGNATURE-----