[PATCH 0 of 3] resend v2: make CVSNT "mergepoints" test script work

[Patrick Mézard]

Greg Ward a écrit :
> Resending my patch series from last week: these three patches transform
> test-convert-cvs-builtincvsps-cvsnt-mergepoints -- a test script that
> does not run (execute bit not set), does not work at all with CVS 1.11,
> and works unreliably with CVS 1.12 -- into
> test-convert-cvsnt-mergepoints, a reliable and fully functioning test
> script.
> 
> Really: how bad can that be?  No changes to core code, just polishing a
> broken test script into shape.  ;-)

Thanks.
It seems there is still a problem:

"""
ERROR: test-convert-cvsnt-mergepoints output changed
--- Expected output 
+++ Test output 
@@ -42,6 +42,7 @@
 Merging differences between 1.1 and 1.1.2.2.2.1 into foo.txt
 cvs -f ci -f -m merge2 foo.txt
 new revision: 1.2; previous revision: 1.1
+/Users/pmezard/dev/mercurial/hg/hg-pmezard/tests/test-convert-cvsnt-mergepoints: line 100: cvs: Is a directory
 collecting CVS rlog
 7 log entries
 creating changesets
@@ -54,7 +55,7 @@
 Tag: (none) 
 Branchpoints: MYBRANCH1_1, MYBRANCH1 
 Log:
-foo.txt
+add foo.txt
 
 Members: 
 	foo.txt:INITIAL->1.1 
@@ -90,6 +91,19 @@
 PatchSet 4 
 Date:
 Author:
+Branch: MYBRANCH1_2
+Tag: (none) 
+Parent: 3
+Log:
+bazzie
+
+Members: 
+	foo.txt:1.1.2.2->1.1.2.2.2.1 
+
+---------------------
+PatchSet 5 
+Date:
+Author:
 Branch: MYBRANCH1_1
 Tag: (none) 
 Parent: 1
@@ -100,41 +114,28 @@
 	foo.txt:1.1->1.1.4.1 
 
 ---------------------
-PatchSet 5 
-Date:
-Author:
-Branch: MYBRANCH1_2
-Tag: (none) 
-Parent: 3
-Log:
-bazzie
-
-Members: 
-	foo.txt:1.1.2.2->1.1.2.2.2.1 
-
----------------------
 PatchSet 6 
 Date:
 Author:
-Branch: HEAD
+Branch: MYBRANCH1_1
 Tag: (none) 
-Parents: 1,5
+Parent: 5
 Log:
-merge
+merge1+clobber
 
 Members: 
-	foo.txt:1.1->1.2 
+	foo.txt:1.1.4.1->1.1.4.2 
 
 ---------------------
 PatchSet 7 
 Date:
 Author:
-Branch: MYBRANCH1_1
+Branch: HEAD
 Tag: (none) 
-Parents: 4,3
+Parent: 1
 Log:
-merge
+merge2
 
 Members: 
-	foo.txt:1.1.4.1->1.1.4.2 
+	foo.txt:1.1->1.2 
 
!
Failed test-convert-cvsnt-mergepoints: output changed
# Ran 1 tests, 0 skipped, 1 failed.
"""

The first change looks like an OSX thing, I could fix it later.
The other changes look like a determinism issue at first but cvsps output is a bit different too.

--
Patrick Mézard