Re: vendor/local files in CVS

[Mark D. Baushke]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Pierre Asselin <address@hidden> writes:

> 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.

New imports are always on the vendor branch with -X and 1.2 is always
dead. So, the trunk is no longer ever potentially broken.

> 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 .

Immediately after the second import, only files that you wanted visible
on the trunk from the first import are visible, no new file is visible
and new versions would need to be explicitly merged into the trunk.

        -- Mark

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.3 (FreeBSD)

iD8DBQFCHWFl3x41pRYZE/gRAu/BAJ4jmHDBr45EXRSUOmlyqVfdJcBKtwCeOmS+
SdnacJKAdixwkklxP8CIS+A=
=zQiH
-----END PGP SIGNATURE-----