Re: Merging libgtop2 into HEAD

[George <jirka 5z com>]

On Thu, Jan 10, 2002 at 01:24:50PM +0000, Michael Meeks wrote:
> Hi Kevin,
> 
> 	And of course, this isn't going to work:
> 
> On Thu, 2002-01-10 at 09:22, Michael Meeks wrote:
> > 	cvs -z3 upd -Pd -r MY_LIBTOP_BRANCH
> > 	cvs -z3 upd -Pd -A

This is what the the -j flag is for.  I believe
 	cvs -z3 upd -Pd -j MY_LIBTOP_BRANCH
instead of the above two should work.  If you do it in HEAD it should
merge in all the changes done in MY_LIBTOP_BRANCH.  I could be smoking
crack though, but that's what I seem to remember.

George

-- 
George <jirka 5z com>
   - I'm getting better!
   - No, you're not. You'll be stone dead in a moment.
                       -- Monty Python