New subject: Hopefully just me: Conflicts in shell.sourceforge.net:/home/groups/xemacs/xemacsweb

Monday, 31 July 2000

        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

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

2000

1999

1998

Re: Hopefully just me: Conflicts in shell.sourceforge.net:/home/groups/xemacs/xemacsweb