Re: Help merging vendor branch:

[Dan . Crea]

Hi Derek:

I am sorry, I am still a bit new to CVS.  I don't know what val-tags are? 
Also, where am I executing the cvs up ... form?  Is this in the working
directory of the branch   That is cvs -r co -r <branch> <module>?

Thanks
Dan




Derek Robert Price <address@hidden>
10/29/2003 04:42 PM


        To:     address@hidden
        cc:     address@hidden
        Subject:        Re: Help merging vendor branch:


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

address@hidden wrote:

|Hello all:
|
|I need some help merging a vendor branch into a "regular" branch.  I just
|imported a new vendor branch.  I now need to propagate this branch onto
|all the branches that where already existing before the import.  How can
I
|do this?
|
|Thanks much!


Make sure a tag that isn't attached to any files appears in val-tags.
Then do a merge using the release tag you specified to import:

    cvs up -j<nonexistanttag> -j<releasetag>

Derek
- --
~                *8^)

Email: address@hidden

Get CVS support at <http://ximbiot.com>!
- --
No experiment can be more interesting than that we are now trying, and
which we trust will end in establishing the fact, that men can be
governed by reason and truth.  Our first object should therefore be to
leave open to him all the avenues of truth.  The most effective hitherto
found, is the freedom of the press.  It is, therefore, the first shut up
by those who fear the investigation of their actions.
            - Thomas Jefferson

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)
Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org

iD8DBQE/oEJjLD1OTBfyMaQRAnIrAKC3xWkqTx48aKarj7OcceBe1btpoACfSCt1
Q6LxljIzp1I/b8ap0kMtFlE=
=JwgU
-----END PGP SIGNATURE-----






**************************************************************************************
This communication is intended solely for the addressee and is
confidential. If you are not the intended recipient, any disclosure,
copying, distribution or any action taken or omitted to be taken in
reliance on it, is prohibited and may be unlawful. Unless indicated
to the contrary: it does not constitute professional advice or
opinions upon which reliance may be made by the addressee or any
other party, and it should be considered to be a work in progress.
**************************************************************************************