Re: Merging new files from HEAD to branch

[Jim Hyslop]

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

On 12-05-06 11:46 AM, Julia Jacobson wrote:
> Hello everybody out there using CVS,
> 
> When I add a new file to a branch and then merge this file into
> the HEAD, CVS keeps updating this file after changing between HEAD
> and branch or vice versa by "cvs up -A" or "cvs up -r branch"
> although the file itself hasn't been changed.

Just to make sure I understand what you're saying, does the following
sequence of commands illustrate your problem:

cvs up -r branch
cvs add afile.txt
[other commands]
cvs up -r HEAD
[add/update files, but do not touch afile.txt]
cvs update
[CVS indicates that afile.txt is being updated]

It's a long shot, but have you tried the `cvs update -A` option to
clear all sticky tags?


Does the same behaviour occur if you checkout the files into a new
working area ("sandbox")? Example:

cvs co yourmodule
cd yourmodule
cvs update -r branch
cvs update -r HEAD

Do the newer files still update each time?


- -- 
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.8 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org/

iEYEARECAAYFAk+pERkACgkQLdDyDwyJw+OdGwCfVvzIMqCh4cLZdyH/O4Ehfj4M
IHIAnj0OL5whK/TbWumxLDWUxPsVrhLN
=ClKu
-----END PGP SIGNATURE-----