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:
> 
> > 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.
> 
> Hmmm, I see.  I had read the 1.12 documentation at
> https://www.cvshome.org/docs/manual/cvs-1.12.11/cvs_16.html#SEC115
> and it didn't occur to me that all the files are new during the
> initial import.

Yup.

> So if you check out a trunk sandbox after the initial "import -X",
> you get an empty ?

Yes.

> I can see a new FAQ being born.  How do you do
> the initial merge, with just one "-jVENDOR" ?

Sure. 

  cvs update -d -jVENDOR

For future imports, something like this is more likely:

  cvs update -d -jVENDOR:yesterday -jVENDOR

Here is the thread that discusses the new option:

  http://lists.gnu.org/archive/html/bug-cvs/2004-06/msg00173.html

> Hey, multiple vendor branches should work now.

I have not tried it, but you may be correct.

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

iD8DBQFCHoj63x41pRYZE/gRAuuxAKCfXcVW8B0CsbJwiTP5sURz48M3HgCeNQMP
gVb4XZjRTb4YvvG4wtNgA+w=
=dukG
-----END PGP SIGNATURE-----