Re: bin/42961: cvs near-silently throws away local mods

[David Holland <dholland-bugs%netbsd.org@localhost>]

The following reply was made to PR bin/42961; it has been noted by GNATS.

From: David Holland <dholland-bugs%netbsd.org@localhost>
To: gnats-bugs%NetBSD.org@localhost
Cc: 
Subject: Re: bin/42961: cvs near-silently throws away local mods
Date: Mon, 24 Dec 2012 04:15:13 +0000

 On Thu, Mar 11, 2010 at 07:15:01PM +0000, dholland%eecs.harvard.edu@localhost 
wrote:
  >    valkyrie% cvs -q update -dP
  >    P lfs/lfs_vfsops.c
  >    P ufs/ufs_lookup.c
  >    P ufs/ufs_wapbl.c
  >    cvs update: checksum failure after patch to ufs/ufs_wapbl.c; will refetch
  >    cvs client: refetching unpatchable files
  >    cvs update: warning: ufs/ufs_wapbl.c was lost
  >    U ufs/ufs_wapbl.c
  >    valkyrie% 
  > 
  > and now:
  >    valkyrie% cvs diff ufs/ufs_wapbl.c
  >    valkyrie% 
  > 
  > Note that it did not even attempt to merge.
 
 I just had this happen again, after a couple years without seeing it:
 
 macaran% cvs -q update -dP
 P files/make_pkgsrc.mak
 cvs update: checksum failure after patch to files/make_pkgsrc.mak;
 will refetch
 cvs client: refetching unpatchable files
 cvs update: warning: files/make_pkgsrc.mak was lost
 U files/make_pkgsrc.mak
 macaran% cvs diff files/make_pkgsrc.mak 
 macaran% 
 
 In this case I can report exactly what happened to provoke the
 situation, although I haven't tried reproducing it:
 
 (1) edit a file on host A (macaran), test-compile
 (2) apply the same edit by hand on host B, make a one-character typo
 (3) fail to notice the typo, commit (to pkgsrc, so remote cvs on all hosts)
 (4) update on macaran
 (5) get a merge conflict
 (6) examine the merge conflict, notice the typo
 (7) fix the typo on host B
 (8) commit on host B
 (9) update on macaran again, with the above result.
 
 This time the changes that got lost were not important (being just the
 merge conflict with the typo) but it did lose them; there is no .#
 file from the event above, only one from step (4).
 
 The version of CVS on macaran is:
 
 Concurrent Versions System (CVS) 1.12.13 (client/server)
 with CVSACL Patch 1.2.5 (cvsacl.sourceforge.net)
 
 and it's running 6.99.11 from October 15.
 
 -- 
 David A. Holland
 dholland%netbsd.org@localhost