Sankaranarayanan K V wrote:
> I am trying to make the HEAD of a branch B1 the same as that of another
> branch B2 by:
>
> cd <B1 sand box>
> cvs update -j B1 -j B2
I'm not sure if the operation you are attempting (update/merge across
branches) is supported in CVS. I question this based on this finding in an
old FAQ:
Archive-name: cvs-faq
Hand Revision: 3.5 <<== Include this in your comments
1A.4
CVS's branch support is a bit primitive, but it was designed to
allow you to create branches, work on them for while and merge
them back into the main line of development. You should also
be able to merge work performed on the main branch into the
branch you are working on. Arbitrary sharing and merging
between branches is not currently supported.
I'd be interested of the known restrictions when attempting to update/merge
across branches.
I would think that updating/merging branches which forked from the same
base version might work. However, if the branches forked from different
base versions, I would think there would be problems since a common
ancestor would not necessarily be found.
David
