cvs users,
I just tried to check out my branch afresh, using the command:
cvs -t -z3 -d:ext:rvenning@cvs.squid.sourceforge.net:/cvsroot/squid co
-j ipv6 squid
which I thought was the way to get my branch, which has the tag ipv6.
The problem is though, that most if not all files have a merge conflict, ie.
something along the lines of
/*
<<<<<<< authenticate.c
* $Id: authenticate.c,v 1.12 2001/02/07 19:11:48 hno Exp $
=======
* $Id: authenticate.c,v 1.4.6.2 2001/02/28 05:24:02 rvenning Exp $
>>>>>>> 1.4.6.2
*
at the top. I know that this isn't what is actually in the cvs source
under my
tag by looking through the web interface...
Can anybody correct my command line?
Roger.
-- ------------------------------------------------------------- Roger Venning \ Do not go gentle into that good night Melbourne \ Rage, rage against the dying of the light. Australia <r.venning@bipond.com> Dylan ThomasReceived on Wed Feb 28 2001 - 02:24:58 MST
This archive was generated by hypermail pre-2.1.9 : Tue Dec 09 2003 - 16:13:35 MST