From owner-freebsd-questions Tue Aug 28 10:36:37 2001 Delivered-To: freebsd-questions@freebsd.org Received: from box.mfnx.net (box.mfnx.net [64.124.216.37]) by hub.freebsd.org (Postfix) with ESMTP id AE44837B403 for ; Tue, 28 Aug 2001 10:36:34 -0700 (PDT) (envelope-from peterp@above.net) Received: from ug.mfnx.net (ug.mfnx.net [64.124.216.38]) by box.mfnx.net (8.9.3/8.9.1) via ESMTP id KAA82405 for ; Tue, 28 Aug 2001 10:36:34 -0700 (PDT) env-from (peterp@above.net) Received: from ug.mfnx.net (ug.mfnx.net [64.124.216.38]) by ug.mfnx.net (8.9.3/8.9.1) via ESMTP id KAA52558 for ; Tue, 28 Aug 2001 10:36:34 -0700 (PDT) env-from (peterp@above.net) Date: Tue, 28 Aug 2001 10:36:34 -0700 (PDT) From: Pete Perreault X-Sender: peterp@ug.mfnx.net To: freebsd-questions@FreeBSD.ORG Subject: cvs update problem Message-ID: MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Sender: owner-freebsd-questions@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG I am attempting to update /usr/src after a cvsup but I am getting file conflicts indicating some file have been modified but are not in the repository. Also CVS doesn't know about other files in the directory as indicated by the ? before the file name. I'll include here what I believe pertains to this issue. echo $CVSROOT /usr/cvsroot more /usr/src/CVS/Root /usr/cvsroot more /usr/src/CVS/Repository /usr/cvsroot/src I have *default prefix=/usr/cvsroot set in my stable-supfile. Does anyone have an idea as to what I am doing incorrectly or what may be going on? Pete To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-questions" in the body of the message