[issue1577] Failed test-convert-cvs-synthetic: output changed

[tomba]

New submission from tomba <1ipsfgq02 at sneakemail.com>:

At current tip of hg-stable:

$ hg id
4b76746a988b tip

hg-stable$ make test-convert-cvs-synthetic
cd tests && python run-tests.py  test-convert-cvs-synthetic

ERROR: test-convert-cvs-synthetic output changed
--- Expected output 
+++ Test output 
@@ -2,9 +2,13 @@
 cvs checkout: Updating proj
 % create file1 on the trunk
 cvs add: scheduling file `file1' for addition
-cvs add: use `cvs commit' to add this file permanently
+cvs add: use 'cvs commit' to add this file permanently
+RCS file: *REPO*/proj/file1,v
+done
+Checking in file1;
 *REPO*/proj/file1,v  <--  file1
 initial revision: 1.1
+done
 % create two branches
 cvs tag: Tagging .
 T file1
@@ -13,25 +17,39 @@
 % create file2 on branch v1_0
 cvs update: Updating .
 cvs add: scheduling file `file2' for addition on branch `v1_0'
-cvs add: use `cvs commit' to add this file permanently
+cvs add: use 'cvs commit' to add this file permanently
+RCS file: *REPO*/proj/Attic/file2,v
+done
+Checking in file2;
 *REPO*/proj/Attic/file2,v  <--  file2
 new revision: 1.1.2.1; previous revision: 1.1
+done
 % create file3, file4 on branch v1_1
 cvs update: Updating .
-cvs update: `file2' is no longer in the repository
+cvs update: file2 is no longer in the repository
 cvs add: scheduling file `file3' for addition on branch `v1_1'
 cvs add: scheduling file `file4' for addition on branch `v1_1'
-cvs add: use `cvs commit' to add these files permanently
+cvs add: use 'cvs commit' to add these files permanently
+RCS file: *REPO*/proj/Attic/file3,v
+done
+Checking in file3;
 *REPO*/proj/Attic/file3,v  <--  file3
 new revision: 1.1.2.1; previous revision: 1.1
+done
+RCS file: *REPO*/proj/Attic/file4,v
+done
+Checking in file4;
 *REPO*/proj/Attic/file4,v  <--  file4
 new revision: 1.1.2.1; previous revision: 1.1
+done
 % merge file2 from v1_0 to v1_1
 cvs update: Updating .
 U file2
 cvs commit: Examining .
+Checking in file2;
 *REPO*/proj/Attic/file2,v  <--  file2
 new revision: 1.1.4.2; previous revision: 1.1.4.1
+done
 % convert to hg
 initializing destination proj.hg repository
 using builtin cvsps
!
Failed test-convert-cvs-synthetic: output changed
# Ran 1 tests, 0 skipped, 1 failed.
make: *** [test-convert-cvs-synthetic] Error 1

hg-stable$ cvs --version | grep Version
Concurrent Versions System (CVS) 1.11.22 (client/server)

hg-stable$ rpm -qi cvs | head -8
Name        : cvs                          Relocations: /usr 
Version     : 1.11.22                           Vendor: CentOS
Release     : 5.el5                         Build Date: Sat 17 Mar 2007 05:28:58 AM PDT
Install Date: Thu 03 Apr 2008 01:38:27 PM PDT      Build Host: builder6
Group       : Development/Tools             Source RPM: cvs-1.11.22-5.el5.src.rpm
Size        : 1559997                          License: GPL
Signature   : DSA/SHA1, Tue 03 Apr 2007 05:22:15 PM PDT, Key ID a8a447dce8562897
URL         : http://www.cvshome.org/

$ rpm -qi rcs | head -8
Name        : rcs                          Relocations: /usr 
Version     : 5.7                               Vendor: CentOS
Release     : 30.1                          Build Date: Mon 08 Jan 2007 08:05:27 PM PST
Install Date: Wed 21 May 2008 11:58:06 AM PDT      Build Host: builder6.centos.org
Group       : Development/Tools             Source RPM: rcs-5.7-30.1.src.rpm
Size        : 707507                           License: GPL
Signature   : DSA/SHA1, Tue 03 Apr 2007 05:27:05 PM PDT, Key ID a8a447dce8562897
URL         : http://www.gnu.org/software/rcs/

----------
messages: 8917
nosy: gward, tomba
priority: bug
status: unread
title: Failed test-convert-cvs-synthetic: output changed
topic: 1.2, convert

____________________________________________________
Mercurial issue tracker <mercurial-bugs at selenic.com>
<http://www.selenic.com/mercurial/bts/issue1577>
____________________________________________________