Is this the expect behavior of update?

[Steven Levine]

Hi,

I've got a client that did not do quite what I told them to and they ended
up with some results they did not expect.  FWIW, we are running a private
1.12.x build on eCS (i.e. OS/2) that for our purposes is working well.

The client discovered some import errors (missing -k b flags) after some
users already had committed a few changes.  Rather than importing and
merging to correct the errors, they physically deleted the module from the
respository and redid the import.  Some users who were relatively new to
cvs did not protect their local changes before refreshing their sandboxes
with cvs update.  The result was the local changes got overwritten.

I duplicated the activity on my test repository:

After the repository rebuild and import but before the update, cvs log
reports:

RCS file: j:/tmp/TestCVSRepo/file1.txt,v
Working file: file1.txt
head: 1.1
branch: 1.1.1
locks: strict
access list:
symbolic names:
        R00: 1.1.1.1
        V00: 1.1.1
keyword substitution: kv
total revisions: 2;     selected revisions: 2
description:
----------------------------
revision 1.1
date: 2004/06/01 16:09:14;  author: root;  state: Exp;
branches:  1.1.1;
Initial revision
----------------------------
revision 1.1.1.1
date: 2004/06/01 16:09:14;  author: root;  state: Exp;  lines: +0 -0
importing
=============================================================================

cvs status reports:

===================================================================
File: file1.txt         Status: Needs Patch

   Working revision:    1.2     Tue Jun 15 15:48:40 2004
   Repository revision: 1.1.1.1 j:/tmp/TestCVSRepo/file1.txt,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

Notice that v1.2 no longer exists in the repository and that cvs claims
that the file will be patched.

cvs update reports:

U file1.txt

and overwrites the modified file.

After this cvs status reports:

===================================================================
File: file1.txt         Status: Up-to-date

   Working revision:    1.1.1.1 Tue Jun 15 16:18:26 2004
   Repository revision: 1.1.1.1 j:/tmp/TestCVSRepo/file1.txt,v
   Sticky Tag:          (none)
   Sticky Date:         (none)
   Sticky Options:      (none)

I don't really consider this a cvs defect, although it might be useful if
in this case cvs complained to alert the user that something is seriously
out of sync.

Any comments?

Thanks,

Steven

-- 
--------------------------------------------------------------------------------------------
Steven Levine <address@hidden>  MR2/ICE 2.44 #10183
Warp4/FP15/14.093c_W4 www.scoug.com irc.fyrelizard.com #scoug (Wed 7pm PST)
--------------------------------------------------------------------------------------------