[PATCH] convert: fix cvsnt mergepoint referring synthetic parent

[Greg Ward]

On Wed, Jun 3, 2009 at 8:47 AM, I wrote:
> On a related note, test-convert-cvs-builtincvsps-cvsnt-mergepoints is
> not executable and its name is a mouthful.  How about a patch to chmod
> +x it and rename to test-convert-cvsnt-mergepoints?

I may have spoken too soon: when I chmod +x
test-convert-cvs-builtincvsps-cvsnt-mergepoints and run it, it fails:

ERROR: test-convert-cvs-builtincvsps-cvsnt-mergepoints output changed
--- Expected output
+++ Test output
@@ -26,15 +26,13 @@
 checking in
 new revision: 1.1.2.2.2.1; previous revision: 1.1.2.2
 U foo.txt
-checking in
-new revision: 1.1.4.1; previous revision: 1.1
 rcsmerge: warning: conflicts during merge
 merging MYBRANCH1
 retrieving revision 1.1
 retrieving revision 1.1.2.2
 Merging differences between 1.1 and 1.1.2.2 into foo.txt
 checking in
-new revision: 1.1.4.2; previous revision: 1.1.4.1
+new revision: 1.1.4.1; previous revision: 1.1
 U foo.txt
 merging MYBRANCH1_2
 retrieving revision 1.1
!..
Failed test-convert-cvs-builtincvsps-cvsnt-mergepoints: output changed

The first diff looks like one of those arbitrary differences in CVS
output across platforms/versions.  The second one could be more
serious.

Greg