builder@nbbuilder:~$ mkdir /tmp/mergetest
builder@nbbuilder:~$ cd /tmp/mergetest/
builder@nbbuilder:/tmp/mergetest$ alias nbcvs
alias nbcvs='runsocks cvs -d :pserver:rbalada@cvs.netbeans.org:/cvs'
builder@nbbuilder:/tmp/mergetest$ nbcvs version
Client: Concurrent Versions System (CVS) 1.11 (client/server)
Server: Concurrent Versions System (CVS) 1.11.1p1 (client/server)
builder@nbbuilder:/tmp/mergetest$ nbcvs -q co -r orion_fcs core
[snip]
[    a lot of regular output    ]
[snip]
builder@nbbuilder:/tmp/mergetest$ cd core
builder@nbbuilder:/tmp/mergetest/core$ nbcvs up -j orion_fcs -j orion_fcs_ml
[snip]
[    a lot of regular output regarding merging,
     already present in Michal's attachment        ]
[snip]
builder@nbbuilder:/tmp/mergetest/core$ nbcvs -q up
[  no output, exit code 0  ]
builder@nbbuilder:/tmp/mergetest/core$