>>>>> "Tor" == Tor Arntsen <tor(a)spacetec.no> writes:
Tor> On Jul 31, 0:41, Adrian Aichner wrote:
>> I have been surprised by following CVS conflicts in
>> [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]$
Tor> It looks like someone has checked in new stuff since you did your
Tor> checkout/last update, and that you have locally modified those files.
Tor> cvs status -v FAQ/index.htm
Tor> cvs log FAQ/index.html
Tor> should tell you something.
Tor> You can make a local copy of that directory and do a 'cvs update'
Tor> to see what happens. If everything for some reason (it shouldn't) get
Tor> screwed up you can just rm -rf it and go back to square one.
Thanks, Tor, it dawned on me 10 minutes after I sent this mail, and I
did just what you suggest here.