[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Merging new files from HEAD to branch
From: |
Julia Jacobson |
Subject: |
Re: Merging new files from HEAD to branch |
Date: |
Tue, 8 May 2012 13:37:28 -0700 (PDT) |
User-agent: |
G2/1.0 |
> 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.