[prev in list] [next in list] [prev in thread] [next in thread] 

List:       squid-dev
Subject:    Re: cvs woes [HELP!]
From:       Henrik Nordstrom <hno () hem ! passagen ! se>
Date:       2001-02-28 20:37:22
Message-ID: 3A9D6182.5CF4ABF2 () hem ! passagen ! se
[Download RAW message or body]

-r ipv6

-j is a very different thing, used when you merge changes from some
other branch into your working directory.

Please read http://squid.sourceforge.net/CVS.html if you haven't
already.

/Henrik


Roger Venning wrote:
> 
> 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 Thomas


[prev in list] [next in list] [prev in thread] [next in thread]