[cl@bm617259 www]$ cvs -t ci about-lit_zeitsch.html
 -> main loop with CVSROOT=:pserver:cloph@localhost:/cvs
 -> Connecting to localhost(127.0.0.1):2401
 -> system('vi' '/tmp/cvszNR9eo')
 -> unlink_file(/tmp/cvszNR9eo)
 -> Sending file `about-lit_zeitsch.html' to server
S-> checkout (/cvs/de/www/about-lit_zeitsch.html,v, 1.10, , (function))
 -> ParseInfo(/cvs/CVSROOT/commitinfo, de/www, ALL)
S-> system('/cvs/CVSROOT/commit_prep' '-u' 'cloph' '/cvs/de/www' 'about-lit_zeitsch.html')
S-> unlink_file(/tmp/cvsM8aWaX)
Checking in about-lit_zeitsch.html;
/cvs/de/www/about-lit_zeitsch.html,v  <--  about-lit_zeitsch.html
S-> checkout (/cvs/de/www/about-lit_zeitsch.html,v, 1.10, -ko, /tmp/cvsN8aWaX)
new revision: 1.11; previous revision: 1.10
S-> rename(/cvs/de/www/,about-lit_zeitsch.html,,/cvs/de/www/about-lit_zeitsch.html,v)
S-> unlink_file(/tmp/cvsN8aWaX)
S-> unlink_file(/tmp/cvsO8aWaX)
done
S-> checkout (/cvs/de/www/about-lit_zeitsch.html,v, , , (function))
S-> server_register(about-lit_zeitsch.html, 1.11, Tue Oct  7 17:29:06 2003, , , , )
S-> Register(about-lit_zeitsch.html, 1.11, Tue Oct  7 17:29:06 2003, ,  )
S-> fopen(/cvs/CVSROOT/history,a)
 -> unlink_file(CVS/Base/about-lit_zeitsch.html)
 -> Register(about-lit_zeitsch.html, 1.11, Tue Oct  7 17:29:27 2003, ,  )
S-> loginfo_xml(/cvs/de/www, ...)
S-> entry_xml(Modified, about-lit_zeitsch.html, ...)
 -> ParseInfo(/cvs/CVSROOT/loginfo, de/www, ALL)
S-> run_popen(/cvs/CVSROOT/log_accum -u cloph "de/www about-lit_zeitsch.html",w)
Processing log script arguments...
Mailing the commit message to cvs@de.openoffice.org (from cloph@openoffice.org)
S-> run_popen((sleep 2; if [ -d /usr/local/tigris/data/helm/htdoc/de/www ]; then cd /usr/local/tigris/data/helm/htdoc/de/www; /usr/bin/cvs -q update -d; fi) &,w)
S-> rename(CVS/Entries.Backup,CVS/Entries)
S-> unlink_file(CVS/Entries.Log)
S-> close_xml(0xb0090)
C about-facts.html
C about-lit_buecher.html
C about-lit_hut.html
RCS file: /usr/local/tigris/data/helm/cvs/repository/de/www/about-lit_zeitsch.html,v
retrieving revision 1.10
retrieving revision 1.11
Merging differences between 1.10 and 1.11 into about-lit_zeitsch.html
rcsmerge: warning: conflicts during merge
cvs update: conflicts found in about-lit_zeitsch.html
C about-lit_zeitsch.html
? dev/neu/doc/faq/writer
? marketing/screenshots1.1/CTL
? marketing/screenshots1.1/Calc
? marketing/screenshots1.1/Desktop-OOo
? marketing/screenshots1.1/Gallery
? marketing/screenshots1.1/Html-Editor
? marketing/screenshots1.1/Impress
? marketing/screenshots1.1/Screenshots1.1
? marketing/screenshots1.1/Writer
? marketing/screenshots1.1/draw/small
 -> rename(CVS/Entries.Backup,CVS/Entries)
 -> unlink_file(CVS/Entries.Log)
 -> Lock_Cleanup()
[cl@bm617259 www]$