Re: editors get lost with running an update

2005-03-01 Thread Thomas Singer
Using the diff command is no option, because it uses E responses instead of 
sending the file content. This causes major troubles with non-ASCII-characters.

--
Best regards,
Thomas Singer
_
smartcvs.com
Jim.Hyslop schrieb:
Thomas Singer wrote:
We've encountered a problem with GNU CVS 1.12.9. Please see 
the following log.
[...]
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.
Well, I think the first thing to do is to fix the bug (sounds like a bug in
CVS 1.12 to me).
I don't have a copy of 1.12 handy to test this, but try adding the -p option
to see if that helps.
Since you're doing a file compare, you could just do it the way CVS expects
you to - invoke the 'diff' command and send the current contents of the file
;=) Or, since you want to fetch the original version in its entirety, you
could send an empty file. CVS will then respond with all the lines that you
deleted, i.e. the entire file (which you can then redirect to your
external file comparer).

___
Bug-cvs mailing list
Bug-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-cvs


Re: editors get lost with running an update

2005-02-28 Thread gnu-cvs
Using the diff command is no option, because it uses E responses instead of
sending the file content. This causes major troubles with non-ASCII-characters.
--
Best regards,
Thomas Singer
_
smartcvs.com
Jim.Hyslop schrieb:
Thomas Singer wrote:
We've encountered a problem with GNU CVS 1.12.9. Please see 
the following log.
[...]
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.
Well, I think the first thing to do is to fix the bug (sounds like a bug in
CVS 1.12 to me).
I don't have a copy of 1.12 handy to test this, but try adding the -p option
to see if that helps.
Since you're doing a file compare, you could just do it the way CVS expects
you to - invoke the 'diff' command and send the current contents of the file
;=) Or, since you want to fetch the original version in its entirety, you
could send an empty file. CVS will then respond with all the lines that you
deleted, i.e. the entire file (which you can then redirect to your
external file comparer).


___
Bug-cvs mailing list
Bug-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-cvs


editors get lost with running an update

2005-02-27 Thread Thomas Singer
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):
[EMAIL PROTECTED]:~/test$ la
total 8
drwxr-xr-x2 tom  tom  4096 Feb 27 13:34 .
drwxr-xr-x   34 tom  tom  4096 Feb 27 13:30 ..
[EMAIL PROTECTED]:~/test$ cvs checkout test
cvs checkout: Updating test
U test/file.txt
[EMAIL PROTECTED]:~/test$ la
total 12
drwxr-xr-x3 tom  tom  4096 Feb 27 13:34 .
drwxr-xr-x   34 tom  tom  4096 Feb 27 13:30 ..
drwxr-xr-x3 tom  tom  4096 Feb 27 13:34 test
[EMAIL PROTECTED]:~/test$ cd test
[EMAIL PROTECTED]:~/test/test$ la
total 12
drwxr-xr-x3 tom  tom  4096 Feb 27 13:34 .
drwxr-xr-x3 tom  tom  4096 Feb 27 13:34 ..
drwxr-xr-x2 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:
[EMAIL PROTECTED]:~/test/test$ cvs editors
Now we start editing file.txt:
[EMAIL PROTECTED]:~/test/test$ cvs edit file.txt
[EMAIL PROTECTED]:~/test/test$ cvs editors
file.txttom Sun Feb 27 12:34:57 2005 GMTlinux   
/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:

[EMAIL PROTECTED]:~/test/test$ mv file.txt file.txt.original
[EMAIL PROTECTED]:~/test/test$ la
total 12
drwxr-xr-x3 tom  tom  4096 Feb 27 13:35 .
drwxr-xr-x3 tom  tom  4096 Feb 27 13:34 ..
drwxr-xr-x3 tom  tom  4096 Feb 27 13:34 CVS
-rw-r--r--1 tom  tom 0 Feb 27 13:25 file.txt.original
[EMAIL PROTECTED]:~/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:

[EMAIL PROTECTED]:~/test/test$ la
total 12
drwxr-xr-x3 tom  tom  4096 Feb 27 13:35 .
drwxr-xr-x3 tom  tom  4096 Feb 27 13:34 ..
drwxr-xr-x3 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
[EMAIL PROTECTED]:~/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

___
Bug-cvs mailing list
Bug-cvs@gnu.org
http://lists.gnu.org/mailman/listinfo/bug-cvs