Re: Help needed with CVS

ons 2006-05-17 klockan 10:56 -0400 skrev Christos Tsantilas:
> Hi,
> I am just asking to be sure:
> To merge icap branch to the squid-2.6 needed steps are:
>
> -I am going to my squid-2.6 cvs sources
> - cvsmkbranch icap-2_6
> - I am going to the new directory and:
> - cgvsmergeinit icap-2_5 s2_5
> - cvsmerge icap-2_5

Yes, that is the idea.

Note: To get the squid-2.6 tree for development

  cvs -d your_sf_id@cvs.devel.squid-cache.org:/cvsroot/squid co -d squid-2.6 squid

This tree is only used for creating branches...

Regards
Henrik