bug-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

editors get lost with running an update


From: Thomas Singer
Subject: editors get lost with running an update
Date: Sun, 27 Feb 2005 13:54:52 +0100
User-agent: Mozilla Thunderbird 1.0 (Windows/20041206)

Hi,

We've encountered a problem with GNU CVS 1.12.9. Please see the following log.

First, we check out a simple module "test" (cvs watch on was called before):

address@hidden:~/test$ la
total 8
drwxr-xr-x    2 tom      tom          4096 Feb 27 13:34 .
drwxr-xr-x   34 tom      tom          4096 Feb 27 13:30 ..
address@hidden:~/test$ cvs checkout test
cvs checkout: Updating test
U test/file.txt
address@hidden:~/test$ la
total 12
drwxr-xr-x    3 tom      tom          4096 Feb 27 13:34 .
drwxr-xr-x   34 tom      tom          4096 Feb 27 13:30 ..
drwxr-xr-x    3 tom      tom          4096 Feb 27 13:34 test
address@hidden:~/test$ cd test
address@hidden:~/test/test$ la
total 12
drwxr-xr-x    3 tom      tom          4096 Feb 27 13:34 .
drwxr-xr-x    3 tom      tom          4096 Feb 27 13:34 ..
drwxr-xr-x    2 tom      tom          4096 Feb 27 13:34 CVS
-r--r--r--    1 tom      tom             0 Feb 27 13:25 file.txt

At this point no editors are defined:

address@hidden:~/test/test$ cvs editors

Now we start editing file.txt:

address@hidden:~/test/test$ cvs edit file.txt
address@hidden:~/test/test$ cvs editors
file.txt        tom     Sun Feb 27 12:34:57 2005 GMT    linux   
/home/tom/test/test

The user edits the file and invokes a file compare in SmartCVS. SmartCVS fetched the original file content by using the update command, simulating a non-existent local file. We simulate SmartCVS' behaviour by renaming file.txt to file.txt.original:

address@hidden:~/test/test$ mv file.txt file.txt.original
address@hidden:~/test/test$ la
total 12
drwxr-xr-x    3 tom      tom          4096 Feb 27 13:35 .
drwxr-xr-x    3 tom      tom          4096 Feb 27 13:34 ..
drwxr-xr-x    3 tom      tom          4096 Feb 27 13:34 CVS
-rw-r--r--    1 tom      tom             0 Feb 27 13:25 file.txt.original
address@hidden:~/test/test$ cvs update file.txt
cvs update: warning: `file.txt' was lost
U file.txt

Unfortunately GNU CVS 1.12.9 seems to think, the file is lost and destroys the editors information:

address@hidden:~/test/test$ la
total 12
drwxr-xr-x    3 tom      tom          4096 Feb 27 13:35 .
drwxr-xr-x    3 tom      tom          4096 Feb 27 13:34 ..
drwxr-xr-x    3 tom      tom          4096 Feb 27 13:35 CVS
-r--r--r--    1 tom      tom             0 Feb 27 13:35 file.txt
-rw-r--r--    1 tom      tom             0 Feb 27 13:25 file.txt.original
address@hidden:~/test/test$ cvs editors

CVSNT 2.0.58d behaves correctly, it keeps the editors information.

What request SmartCVS should send, so GNU CVS 1.12.9 just sends the original content of the file without destroying the editors information? Thanks in advance.

--
Best regards,
Thomas Singer
_____________
smartcvs.com





reply via email to

[Prev in Thread] Current Thread [Next in Thread]