[ODE] Re: Problem with UNSTABLE branch

[Darío Mariani]

  The problem seems to be that some patches were applied to the MAIN
branch and not applied to UNSTABLE. Here is what I did:

1. Erased everything.
2. cvs -d:pserver:anonymous at cvs.sf.net:/cvsroot/opende login
3. cvs -z3 -d:pserver:anonymous at cvs.sf.net:/cvsroot/opende co -j UNSTABLE -P ode
4. cvs -d:pserver:anonymous at cvs.sf.net:/cvsroot/opende logout

And I found these warnings from CVS:
...
U ode/CHANGELOG
RCS file: /cvsroot/opende/ode/CHANGELOG,v
retrieving revision 1.54
retrieving revision 1.54.2.3
Merging differences between 1.54 and 1.54.2.3 into CHANGELOG
rcsmerge: warning: conflicts during merge
...
U ode/ode/src/misc.cpp
RCS file: /cvsroot/opende/ode/ode/src/misc.cpp,v
retrieving revision 1.7
retrieving revision 1.7.2.1
Merging differences between 1.7 and 1.7.2.1 into misc.cpp
rcsmerge: warning: conflicts during merge

So there are two conflicting versions of RandInt, one in each branch.

          Darío

On 7/1/05, Adam D. Moss <adam at gimp.org> wrote:
> Darío Mariani wrote:
> >   I just downloaded de UNSTABLE branch and I found that there seems to
> > be some problem with CVS, the misc.cpp file has a broken dRandInt
> > function, but when I browse the CVS from the web seems to be ok.
> 
> What you have in your local file is a CVS conflict; you have a
> local modification to dRandInt (i.e. you applied someone's
> patch) which could not be automatically merged with the changes
> from CVS.  If you remove misc.cpp and check it out again, it
> should be fine (unless someone's actually checked in their own
> conflicted version to the branch!).
> 
> --adam
> --
> Adam D. Moss   -   adam at gimp.org
> _______________________________________________
> ODE mailing list
> ODE at q12.org
> http://q12.org/mailman/listinfo/ode
>