Re: Hopefully just me: Conflicts in shell.sourceforge.net:/home/groups/xemacs/xemacsweb
On Jul 31, 0:41, Adrian Aichner wrote:
I have been surprised by following CVS conflicts in
shell.sourceforge.net:/home/groups/xemacs/xemacsweb
[adrianaļ¼ orbital xemacsweb]$ cvs -n -q update | grep "^[A-Z] "
cvs server: New directory `faq' -- ignored
C FAQ/index.html
C FAQ/xemacs-faq_toc.html
C FAQ/xemacs-new.html
[...]
M genpage/layout/cookhouse.html
M genpage/layout/examples.html
M genpage/layout/news.html
[adrianaļ¼ orbital xemacsweb]$
[...]
It looks like someone has checked in new stuff since you did your
checkout/last update, and that you have locally modified those files.
cvs status -v FAQ/index.htm
and
cvs log FAQ/index.html
should tell you something.
You can make a local copy of that directory and do a 'cvs update'
to see what happens. If everything for some reason (it shouldn't) get
screwed up you can just rm -rf it and go back to square one.
-Tor