cvs branch 2.2

[RSzczesniak at mis.com.pl]

I don't know cvs client so good, but I use:

cvs -d :pserver:cvs at pserver.samba.org:/cvsroot co -r <SAMBA_BRANCH> samba

and it works without any wierd things.


rafal




"Torsten Curdt" <tcurdt at dff.st>
Wysłane przez: samba-ntdom-admin at us5.samba.org
00-11-03 12:04

 
        Do:     <samba-ntdom at us5.samba.org>
        DW: 
        Temat:  cvs branch 2.2

Sorry, for this... I'm trying to get
a current cvs snapshop from the 2.2
branch and tried this:

cvs -z5 -d :pserver:cvs at pserver.samba.org:/cvsroot co -jSAMBA_2_2 samba

But there are these

<<<<<<< configure
...
=======
..
>>>>>>> 1.125.4.4

everywhere in the files.

What am I doing wrong?
--
Torsten