From owner-freebsd-hackers Sun Mar 16 14:10:46 2003 Delivered-To: freebsd-hackers@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 023CB37B401 for ; Sun, 16 Mar 2003 14:10:45 -0800 (PST) Received: from perrin.int.nxad.com (internal.ext.nxad.com [69.1.70.251]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5876843FBF for ; Sun, 16 Mar 2003 14:10:44 -0800 (PST) (envelope-from sean@perrin.int.nxad.com) Received: by perrin.int.nxad.com (Postfix, from userid 1001) id A1BB421059; Sun, 16 Mar 2003 14:10:43 -0800 (PST) Date: Sun, 16 Mar 2003 14:10:43 -0800 From: Sean Chittenden To: Dag-Erling Sm?rgrav Cc: Nate Williams , Sergey Babkin , hackers@FreeBSD.ORG Subject: Re: making CVS more convenient Message-ID: <20030316221043.GL66903@perrin.int.nxad.com> References: <3E73DCF7.80490FA6@bellatlantic.net> <15988.49648.483313.383942@emerger.yogotech.com> <3E74CC37.DF83EE46@bellatlantic.net> <15988.52765.777500.37926@emerger.yogotech.com> <20030316195807.GH66903@perrin.int.nxad.com> <20030316214841.GJ66903@perrin.int.nxad.com> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: User-Agent: Mutt/1.4i X-PGP-Key: finger seanc@FreeBSD.org X-PGP-Fingerprint: 3849 3760 1AFE 7B17 11A0 83A6 DD99 E31F BC84 B341 X-Web-Homepage: http://sean.chittenden.org/ Sender: owner-freebsd-hackers@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.ORG > > > With the -s option, cvsup will not touch files that it believes are > > > in sync until they are updated on the server. > > ^^^ > > not ? > > no, not "not". "cvsup will not touch files that it believes are in > sync", the operative word here being "believes" - with -s cvsup will > use the checkout list and won't even look at the actual file unless > the server says it has a newer version than what is listed in the > checkout list. I think we're having a mis-communication. I want cvsup to edit the files that are in sync with the master server. I want cvsup to ignore or leave alone files that are out of sync with the server (ie: don't re-transfer the file in the assumption that its been "corrupted"). We working from the same set of intentions and just colliding in the communication dept (most likely what it means to be in "sync")? > > -s is a bit dicey to trust unless you grab an exclusive lock on > > the file and prevent other people from making a change to the file > > on the server. -sc > > You actually *want* the -s induced failure in this case. If -s induces a failure when there are local changes that haven't come down from the master repo, that'd be slick... it still sounds like you'd have to clear your ,v file if you commit your changes after someone had made a change to the file after you made a local commit. [local commit to file A ] [different developer commits to file A on master repo] [commit to file A on master repo] [cvsup local repo with master repo] Wouldn't you have to delete A,v before A,v would continue to pick up future changes? -sc -- Sean Chittenden To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-hackers" in the body of the message