Re: cvs add & join inconsistency

[Pierre Asselin]

Paul Edwards <kerravon@nosppaam.w3.to> wrote:
> With CVS 1.11.5 if I do the following:

> 1. add a file with cvs add, on my own branch, it goes into Attic

> 2. Import that same file (import-tag2)

> 3. Do a cvs update -j import-tag1 -j import-tag2

> Normal operation (if I hadn't already been added in the branch),
> would be for the file to get added on my branch.

Shouldn't you be doing the update -j -j on your trunk?  The trunk
is always broken after an import until you fix it with an update.
Mind you, cvs may do asinine things when you attempt to commit
your import merge to the trunk, or later when you try to merge
your branch back.  I'm not sure what happens with the file added
in two places like that, but I'd like to know what breaks when
using a more standard procedure.


> In this case the file has already been added, so what I want is
> the imported file to replace my "advance beta version" of the
> file.

Hmmm, so you always work on branch and keep your trunk identical
to the official releases?  I still think you want the replacement
to occur on the trunk, not the branch.

> Or at the very least give me a conflict.

> Instead, the attempt to add the imported file is ignored, and the
> branch stays behind.

Do a cvs log on your file.  Is the RCS file still in the Attic?
Does it have the new imported version with its import tag?  Does
it have its RCS default branch set to the vendor branch or to
the trunk?