[ODE] How to get unstable branch from cvs?

[Rodrigo Hernandez]

Hi Bram,

cd to an empty directory

$ cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/opende login
$ cvs -z3 -d:pserver:anonymous at cvs.sourceforge.net:/cvsroot/opende co -r 
UNSTABLE ode

should do it

Cheers!
Bram Stolk wrote:

> Hi there,
>
> The cvs server seems seriously messed up.
> I often get time-outs, and empty responses.
>
> I'm trying to checkout the unstable branch.
> Can someone explain to me how this should be done?
> When I check it out in a new dir, I see that the system
> starts to merge changes??? Why is this needed for a checkout?
> Also, the merges fail, as there are conflicts.
>
> $ cvs -z3 co -j UNSTABLE ode
> cvs checkout: Updating ode
> U ode/.cvsignore
> U ode/CHANGELOG
> RCS file: /cvsroot/opende/ode/CHANGELOG,v
> retrieving revision 1.54
> retrieving revision 1.54.2.5
> Merging differences between 1.54 and 1.54.2.5 into CHANGELOG
> U ode/Double.vcproj
> U ode/DoubleTrimesh.vcproj
> U ode/INSTALL
> RCS file: /cvsroot/opende/ode/INSTALL,v
> retrieving revision 1.7
> retrieving revision 1.7.2.3
> Merging differences between 1.7 and 1.7.2.3 into INSTALL
> U ode/LICENSE-BSD.TXT
> U ode/LICENSE.TXT
> U ode/Makefile
> RCS file: /cvsroot/opende/ode/Makefile,v
> retrieving revision 1.27
> retrieving revision 1.27.2.3
> Merging differences between 1.27 and 1.27.2.3 into Makefile
> ode/Makefile already contains the differences between 1.27 and 1.27.2.3
> ....etc....
>
> The tree that results from this, is unusable, as it includes
> the '>>>>' '====' '<<<<<' conflict markers.
>
> Any hints on how to build the unstable branch are greatly appreciated.
>
> Also, I propose the following:
> Add a --with-cylinder flag to configure.in, so that we can remove
> the contrib/dCylinder2 dir, which currently contains an obsolete patch
> file.
>
> dCyl2 is currently usable, but not yet 100% ok, so in my eyes, a
> perfect candidate for the unstable branch. There should be no problem
> in incorporating it, if we don't compile it by default, but only with
> the --with-cylinder flag. I volunteer do make these changes.
>
>   bram
> _______________________________________________
> ODE mailing list
> ODE at q12.org
> http://q12.org/mailman/listinfo/ode
>