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

APA> Hello All, APA> I have been surprised by following CVS conflicts in APA> shell.sourceforge.net:/home/groups/xemacs/xemacsweb APA> [adriana＠orbital xemacsweb]$ cvs -n -q update | grep "^[A-Z] " APA> cvs server: New directory `faq' -- ignored APA> C FAQ/index.html APA> C FAQ/xemacs-faq_toc.html APA> C FAQ/xemacs-new.html APA> C FAQ/old/XEmacs-FAQ-changes.html APA> C FAQ/old/index.html APA> C FAQ/old/xemacs-current.html APA> C FAQ/old/xemacs-customization.html APA> C FAQ/old/xemacs-deleted.html APA> C FAQ/old/xemacs-faq.html APA> C FAQ/old/xemacs-installation.html APA> C FAQ/old/xemacs-merge.html APA> C FAQ/old/xemacs-miscellaneous.html APA> C FAQ/old/xemacs-subsystems.html APA> C FAQ/oldstuff/xemacs-faq_toc.html APA> C FAQ/upload/xemacs-faq.html APA> C FAQ/upload/xemacs-faq_toc.html <lines deleted by Adrian> APA> [adriana＠orbital xemacsweb]$ APA> I just wanted to make sure noone else is editing files in APA> that working directory before I do a clean checkout there APA> tomorrow morning (Mon 2000/08/01 8:30 +0200). Please report Oops, I meant Mon 2000/07/31 8:30 +0200, but that's irrelevant now. APA> back before then if you have made local changes there. I have a safer solution giving time zone and response time issues: I have moved shell.sourceforge.net:/home/groups/xemacs/xemacsweb to shell.sourceforge.net:/home/groups/xemacs/xemacsweb-2000-07-31-adriana and perfomed a new checkout of xemacsweb. Best regards, Adrian APA> I assume this is just me who got confused commiting from there and my APA> local machine. APA> I am working on a status report (FAQ-style) as well. APA> Good night, APA> Adrian APA> -- APA> Adrian Aichner <adrian(a)xemacs.org&gt;