Re: Help merging vendor branch: ( thanks )

[Dan . Crea]

Hello all:

Thanks for all the help.  With the information you gave me I was able to
get this to merge onto my branch.

Thanks again!
Dan





"Mark D. Baushke" <address@hidden>
Sent by: address@hidden
10/30/2003 11:20 AM


        To:     Derek Robert Price <address@hidden>
        cc:     address@hidden, address@hidden
        Subject:        Re: Help merging vendor branch:


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

Derek Robert Price <address@hidden> writes:

> Mark D. Baushke wrote:
>
> | If you didn't have such a doxygen_1-3-3 tag, then you might need to
use
> | the vendor tag from the import (say for example you called it
> | doxygen_vendor):
> |
> |     cvs co -r b_code_cleanup -d b_code_cleanup MG_HEDGE
> |     cd b_code_cleanup
> |     cvs up -jyesterday:doxygen_vendor -jdoxygen_1-3-4
>
>
> This is what I was talking about, except it's -j<tag>:<date>, not the
> other way around.

Yes, I think I need more caffeine this morning
- -jdoxygen_vendor:yesterday is what I meant to write, I am not sure why
the other one came out... :-(

In any case, good luck on your merge.

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

iD8DBQE/oUhG3x41pRYZE/gRAhorAJ9RXnz8riZ2hJj4a97AkJpJbNcsrwCdEZBd
WDyQaW0BeEaintlfd2tTThU=
=FzE4
-----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.
**************************************************************************************