Date: Wed, 13 Sep 1995 09:56:03 +0800 (WST) From: Peter Wemm <peter@jhome.DIALix.COM> To: David Greenman <davidg@Root.COM> Cc: Nate Williams <nate@rocky.sri.MT.net>, CVS-commiters@freefall.freebsd.org, cvs-usrbin@freefall.freebsd.org Subject: Re: cvs commit: src/usr.bin/find function.c Message-ID: <Pine.BSF.3.91.950913093616.1261A-100000@jhome.DIALix.COM> In-Reply-To: <199509130103.SAA00153@corbin.Root.COM>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, 12 Sep 1995, David Greenman wrote: > >I presume you know what happens if somebody has got a checked out copy of > >one of the previous `versions' of function.c,v rev 1.5? > > Actually, I've never had a problem with that. A cvs update just backs up to > the previous version. What problem are you refering to? Glad you asked.. :-) Your CVS/Entries file records the version of the file you have checked out, and the timestamp of the file "as checked out". When cvs does a scan of the repository, and sees that the head of the repository is v1.5, and sees the Entries file records "1.5", and that the time in the entries file matches the time on the checked out file, then it skips it and goes on to the next file. There's the catch.. What if you check out v1.5, somebody `outdates' v1.5, bringing it back to 1.4, and then immediately commits it back to v1.5. When the poor unsuspecting soul who's got the checked out copy later does a "cvs update", then *nothing happens*. They are left with the original version of v1.5. Worse still, if they edit their version of 1.5, and then commit it, the 1.5 -> 1.6 delta could reverse the "new" version, and restore the old one in a larger delta, causing much suprise and confusion... Now, in Nate's case, he'd added a 1.5 and a 1.6 delta (which I didn't know, because all traces of it were gone), and zapped them out, and added a new 1.5 - cvs would have jumped on the 1.6 reversion back to 1.5, unless somehow somebody did an update between the two versions. Clear as mud, no? IMHO, This really would have been best done as three commits... It might have made David raise an eyebrow when looking over the log, but at least it would have been obvious what was going on... :-) > -DG Cheers, -Peter
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.3.91.950913093616.1261A-100000>