Re: vendor/local files in CVS

[Pierre Asselin]

Mark D. Baushke <address@hidden> wrote:

> Pierre Asselin <address@hidden> writes:

> > ... It's important to understand that each
> > import after the first *breaks the trunk* until
> > the merge has been successfully committed.

> Note that if you are using cvs 1.12.x, you may
> find the -X option to be of interest as it does
> NOT put an import branch into the mainline
> directly. Instead, a dead version 1.2 is created
> on the first import.

So files added by the vendor don't show up on the trunk, but in
the meantime the trunk is still potentially broken.  Suppose the
vendor made changes to several closely related files, some but not
all of which had been modified locally.

Immediately after the second import, the two classes of files are
no longer in sync on the trunk.  The locally modified files are
still at revision 1.2 and have only your changes.  To pick up the
new vendor changes in these files, it is essential to merge the
import and commit a new revision 1.3 .

-- 
pa at panix dot com