The following reply was made to PR user/6363; it has been noted by GNATS. From: "J.C. Roberts" <[email protected]> To: [email protected] Cc: Subject: Re: user/6363: cvs update -C broken Date: Mon, 26 Apr 2010 06:16:07 -0700
On Sat, 24 Apr 2010 03:18:29 -0700 "J.C. Roberts" <[email protected]> wrote: > >Description: > When using the -C flag with `cvs update` the locally modified > files are listed to the command output as "moved" but are only > copied. This results in the locally modified files being merged > rather than a fresh copy being fetched from the cvs repository. > > The cvs(1) man page states: > -C Overwrite locally modified files with clean repository copies. > > Without the -C flag, an attempted merge is expected, but with the -C > flag the docs state an overwrite should be expected. > > >How-To-Repeat: > > # cd /usr/src/sys/conf > # echo "Hello Nurse!" >>GENERIC > # cvs -d$CVSROOT up -C > (Locally modified GENERIC moved to .#GENERIC.1.154 > cvs server: Updating . > M GENERIC > # grep "Nurse" GENERIC > Hello Nurse! > It seems this only happens with mirrors running opencvs, and there are a number of them. thanks sthen@ -- The OpenBSD Journal - http://www.undeadly.org
