Date: Sun, 16 Mar 2003 14:10:43 -0800 From: Sean Chittenden <sean@chittenden.org> To: Dag-Erling Sm?rgrav <des@ofug.org> Cc: Nate Williams <nate@yogotech.com>, Sergey Babkin <babkin@bellatlantic.net>, hackers@FreeBSD.ORG Subject: Re: making CVS more convenient Message-ID: <20030316221043.GL66903@perrin.int.nxad.com> In-Reply-To: <xzpel57q8dj.fsf@flood.ping.uio.no> 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> <xzpk7ezq92p.fsf@flood.ping.uio.no> <20030316214841.GJ66903@perrin.int.nxad.com> <xzpel57q8dj.fsf@flood.ping.uio.no>
next in thread | previous in thread | raw e-mail | index | archive | help
> > > 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20030316221043.GL66903>