[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

cvs add & join inconsistency

From: Paul Edwards
Subject: cvs add & join inconsistency
Date: Fri, 21 Feb 2003 11:02:56 GMT

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.

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

Or at the very least give me a conflict.

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

The real scenario I have is that I develop the code, I add it, I
send it to another (master) site.  The other site then makes any
modifications they do, and then they ship it back to us.  Their
shipment is the official version of the file which I then want
to use.

Anyone think this is a problem?

BFN.  Paul.

reply via email to

[Prev in Thread] Current Thread [Next in Thread]