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

[Greg Ward]

On Mon, Jun 15, 2009 at 4:26 PM, Patrick Mézard<pmezard at gmail.com> wrote:
> 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

That was the entire problem right there: the script was trying to
create a file "cvs" where a directory "CVS" already exists.  Not so
good on a case-insensitive filesystem.

Sending a new patch series momentarily.  Now it's got 4 patches, since
I made the OS X fix a separate patch. It's small but semantically
distinct from the other changes.

Thank you for testing the test!

Greg