Re: Help merging vendor branch:

[Dan . Crea]

Hello again.

Okay...I am now officially lost.  ( and thoroughly confused! )  I have
read all the CVS manual and I have been screwing around with this for
several hours and I still can't get this to work.  I guess I really don't
understand how merging works.  Anyway, back to what I am trying to do.

Here is what I am doing, that is not working:

First I checkout the branch that I am working on:
        cvs -r co -r b_code_cleanup -d b_code_cleanup MG_HEDGE

Now I want to merge the vendor branch Doxygen, tag doxygen_1-3-4 to the
b_code_cleanup branch.

So I do cd to the b_code_cleanup directory and try the following:

cvs update -r doxygen_1-3-4 -d vendor MG_HEDGE
cvs update -r b_code_cleanup -j doxygen_1-3-4 -d vendor MG_HEDGE
cvs co -j b_code_cleanup -j HEAD MG_HEDGE/vendor/doxygen

as well as some other tries.  But nothing I do has worked?  Either the
entire vendor directory is removed with the exception of the doxygen
branch or the directory is created but in the wrong location or it looks
like it worked and I did a commit but then when I release the
b_code_cleanup and check it out again the doxygen files are still missing?

What am I doing wrong?

Thanks
Dan







Derek Robert Price <address@hidden>
10/30/2003 09:10 AM


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


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

address@hidden wrote:

|Hi Derek:
|
|I am sorry, I am still a bit new to CVS.  I don't know what val-tags are?

~    http://www.cvshome.org/docs/manual/cvs-1.12.2/cvs_2.html#SEC13
(search for val-tags)

and

~    http://www.cvshome.org/docs/manual/cvs-1.12.2/cvs_2.html#SEC13

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

~    http://www.cvshome.org/docs/manual/cvs-1.12.2/cvs_5.html#SEC54

Derek
- --
~                *8^)

Email: address@hidden

Get CVS support at <http://ximbiot.com>!
- --
I will not instigate revolution.
I will not instigate revolution.
I will not instigate revolution...

~          - Bart Simpson on chalkboard, _The Simpsons_
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.0.7 (GNU/Linux)
Comment: Using GnuPG with Netscape - http://enigmail.mozdev.org

iD8DBQE/oSntLD1OTBfyMaQRAmH0AJ0UfWbIKL9TCNcwiMrKRd5v6PjwjQCfblap
nCCU5bZt1CGNbDDppr7Vv6w=
=6aTy
-----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.
**************************************************************************************