The cvs contains two 'versions' of ntop, using branch tags, like all good little projects should.
One (the 'tip') is for development activities moving towards ntop 3.1. The other is for the stable release, 3.0. So how does it work? I'm glad you asked! If you do a normal CVS checkout: $ cvs checkout ntop You get the 'tip' or the 3.0.050 development release. To obtain the 3.0 release, you use - surprise - the ntop_3_0 release tag: $ cvs checkout -r ntop_3_0 ntop As we make small changes, release minor updates (3.0a, etc.), that ntop_3_0 release tag will always stay with the branch. So you don't have to worry about which version is which. cvs co ntop - gets the development version cvs co -r ntop_3_0 ntop - gets ntop 3.0 Tell me more? Sure, I'm glad you asked. The place for CVS stuff is http://www.cvshome.org, and for branches it's http://www.cvshome.org/docs/manual/cvs-1.11.6/cvs_5.html But let's give it a go... Here's the (snipped) log for configure.in (stuff in []s are my comments): RCS file: /export/home/ntop/ntop/configure.in,v Working file: configure.in head: 2.208 branch: locks: strict access list: symbolic names: ntop_3_0_rc1: 2.205 [This means that if you cvs co -r ntop_3_0_rc1 ntop/configure.in you get the 2.205 revision of this file] ntop_3_1_devbegin: 2.205 [Another tag so you can always get the source we started development towards 3.1 from] ntop_3_0: 2.205.0.2 [The tag for ntop_3_0 - note the extra digits - means it's a BRANCH] ... description: ---------------------------- revision 2.208 date: 2004/03/23 16:06:03; author: burton; state: Exp; lines: +1 -1 Release roll tip (development) to 3.0.050. Gentlemen start your engines... development is open for business again! -----Burton ---------------------------- ... ---------------------------- revision 2.205 date: 2004/03/18 16:13:24; author: burton; state: Exp; lines: +2 -2 branches: 2.205.2; Release roll 3.0rc1 -----Burton ---------------------------- ... ---------------------------- revision 2.205.2.2 date: 2004/03/22 03:09:33; author: burton; state: Exp; lines: +2 -2 Release roll - 3.0 - new ntop stable... -----Burton ---------------------------- revision 2.205.2.1 date: 2004/03/21 12:48:38; author: burton; state: Exp; lines: +6 -2 JT005 - Add (ifdefed) sys/types.h to tcpd.h test. Thanks Julian ([EMAIL PROTECTED]) -----Burton ============================================================================ = Clear like mud, right? Yeah sure you betcha... Use the -t flag on your cvs checkout and SEE what gets retrieved. $ cvs -t checkout ntop/configure.in -> main loop with CVSROOT=:pserver:[EMAIL PROTECTED]:2401/export/home/ntop -> Connecting to cvs.ntop.org(82.187.228.114):2401 ... -> Register(configure.in, 2.208, Tue Mar 23 16:06:03 2004, , ) ... ^^^^^ It's the 2.208 version or the current development tip! The same command, but with the -r tag: $ cvs -t checkout -r ntop_3_0 ntop/configure.in -> main loop with CVSROOT=:pserver:[EMAIL PROTECTED]:2401/export/home/ntop -> Connecting to cvs.ntop.org(82.187.228.114):2401 ... S-> Register(configure.in, 2.205.2.2, =, , ntop_3_0 ) ... ^^^^^^^^^ Pulls the 2.205.2.2 version or the latest '3.0'... Here's the ASCII-art version: 2.208 | 2.207 | 2.206 2.205.2.2 | | 2.205 ----> 2.205.2.1 | 2.204 | 2.203 If this is too confusing, a .tgz of 3.0 is always available at SourceForge for download. L8tr -----Burton _______________________________________________ Ntop-dev mailing list [EMAIL PROTECTED] http://listgateway.unipi.it/mailman/listinfo/ntop-dev
