Re: Merging new files from HEAD to branch
Julia Jacobson <[email protected]> Tue, 8 May 2012 13:37:28 -0700 (PDT)
| Newsgroups | gmane.comp.version-control.cvs.general |
|---|---|
| Organization | http://groups.google.com |
| Message-ID | <7c98c2f3-7878-43fb-aebf-e4ec6d39bf50@m10g2000vbb.googlegroups.com> |
> It's a long shot, but have you tried the `cvs update -A` option to
> clear all sticky tags?
Yes, this is the usual way I update to HEAD. CVS keeps updating the
new file in the branch and the trunk, which hasn't changed.
> 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
Yes, the behaviour remains.