Tue Dec 22 09:46:16 UTC 2009
? ChangeLog.conflict
? ChangeLog.conflict-2007-06-24
? Makefile-2009-12-04T000414+0100
? Makefile.conflict
? Root
? VALIDATE_HTML_FILES.txt
? build-url.html
? build-url.txt
? genpage-time-stamp
? htdocs-time-stamp
? linklint-2.3.5
? linklint-2.3.6.d-adrian
? make-Documentation-2007-10-02T210352+0200.txt
? make-namazu-re-index-2009-11-26T203651+0100.log
? template-de.html.2007-08-16
? template-de.html.Conflict
? template-ja.html.2007-08-16
? template-ja.html.Conflict
? test.xml
? test.xsl
? validate-time-stamp
? Documentation/21.5/html/ben.png
? Documentation/21.5/html/cthomp.png
? Documentation/21.5/html/hniksic.png
? Documentation/21.5/html/jwz.png
? Documentation/21.5/html/martin.png
? Documentation/21.5/html/mly.png
? Documentation/21.5/html/piper.png
? Documentation/21.5/html/slb.png
? Documentation/packages/pkginfo
? Download/win32/setup.ini-2009-12-04T000832+0100
? FAQ/make.err
? FAQ/xemacs-faq.dvi
? People/adrian.aichner/04080002.JPG
? People/adrian.aichner/04080003.JPG
? Texi2html/doc/texi2html.info
? etc/namazu/mknmz.err
? etc/namazu/templates/cp-to-var-namazu-index.err
cvs update: Updating .
P ChangeLog
cvs update: checksum failure after patch to ./ChangeLog; will refetch
RCS file: /cvsroot/xemacs/XEmacs/xemacsweb/template-de.html,v
retrieving revision 1.48
retrieving revision 1.49
Merging differences between 1.48 and 1.49 into template-de.html
rcsmerge: warning: conflicts during merge
cvs [update aborted]: cannot rename file .new.template- to template-de.html: No such file or directory
FAIL: please fix cvs update errors for commit-trigger to update website again.
Tue Dec 22 09:46:29 UTC 2009