[Issue 108] Update should remove "Resul t of Merge" from Entries file

https://ccvs.cvshome.org/issues/show_bug.cgi?id=108






------- Additional comments from [email protected] Wed Jun 29 04:27:26 -0700 2005 -------

  Even more annoying, if you run "cvs update -C" on a file with conflicts, it
also fails to remove the merge conflict indicators.  This leads to the following
nonsensical sort of output from cvs:

dk@mace /usr/build/src/newlib/libm/common> cvs update -C s_lrint.c
Enter passphrase for key '/home/dk/.ssh/id_rsa':
(Locally modified s_lrint.c moved to .#s_lrint.c.1.2)
cvs update: warning: s_lrint.c was lost
cvs update: move away ./s_lrint.c; it is in the way
C s_lrint.c
dk@mace /usr/build/src/newlib/libm/common>

  It boggles the imagination to see cvs move something, then complain it's lost
it, then complain it's still there and in the way, then claim the clean checkout
has a conflict!

    cheers, 
      DaveK
-- 
Can't think of a witty .sigline today....