Fix cvs-specific tests with cvs-1.12.

http://bz.selenic.com/show_bug.cgi?id=4482
Addresses part of PR 49502.

6 files changed, 81 insertions, 1 deletions

diff --git a/devel/py-mercurial/distinfo b/devel/py-mercurial/distinfo
index e6c063d6e94..6c10b842e4f 100644
--- a/devel/py-mercurial/distinfo
+++ b/devel/py-mercurial/distinfo
@@ -1,5 +1,10 @@
-$NetBSD: distinfo,v 1.11 2014/12/19 11:37:04 wiz Exp $
+$NetBSD: distinfo,v 1.12 2014/12/28 17:16:54 wiz Exp $
 
 SHA1 (mercurial-3.2.3.tar.gz) = 7c870aebcfd7720813c53c75b0939cee8a0e1168
 RMD160 (mercurial-3.2.3.tar.gz) = 76b09015bfb9c84968264a0e419ef5c1b2cd1972
 Size (mercurial-3.2.3.tar.gz) = 4078011 bytes
+SHA1 (patch-tests_test-convert-cvs-branch.t) = 2d801e2e11ab64aa2788b4a31269d72d419f8991
+SHA1 (patch-tests_test-convert-cvs-detectmerge.t) = cc1a846e6fa090149a1ee5d5a91640d7ce39c19a
+SHA1 (patch-tests_test-convert-cvs-synthetic.t) = 6978a6a513f04ef1a24b1026642aa03e2d9869e6
+SHA1 (patch-tests_test-convert-cvs.t) = 69f9210d59066a2bfb8f2f6fce7642a7c9009dc1
+SHA1 (patch-tests_test-convert-cvsnt-mergepoints.t) = 4bfdeb98ece867ea1bb16c0b1dd0db65fc9412a1
diff --git a/devel/py-mercurial/patches/patch-tests_test-convert-cvs-branch.t b/devel/py-mercurial/patches/patch-tests_test-convert-cvs-branch.t
new file mode 100644
index 00000000000..1ec9d16b4e1
--- /dev/null
+++ b/devel/py-mercurial/patches/patch-tests_test-convert-cvs-branch.t
@@ -0,0 +1,15 @@
+$NetBSD: patch-tests_test-convert-cvs-branch.t,v 1.1 2014/12/28 17:16:54 wiz Exp $
+
+Fix cvs-specific tests with cvs-1.12.
+http://bz.selenic.com/show_bug.cgi?id=4482
+
+--- tests/test-convert-cvs-branch.t.orig	2014-12-18 20:59:22.000000000 +0000
++++ tests/test-convert-cvs-branch.t
+@@ -21,6 +21,7 @@ create cvs repository
+   $ CVS_OPTIONS=-f
+   $ export CVS_OPTIONS
+   $ cd ..
++  $ rmdir cvsrepo
+   $ cvscall -q -d "$CVSROOT" init
+ 
+ Create a new project
diff --git a/devel/py-mercurial/patches/patch-tests_test-convert-cvs-detectmerge.t b/devel/py-mercurial/patches/patch-tests_test-convert-cvs-detectmerge.t
new file mode 100644
index 00000000000..c1dde61781f
--- /dev/null
+++ b/devel/py-mercurial/patches/patch-tests_test-convert-cvs-detectmerge.t
@@ -0,0 +1,15 @@
+$NetBSD: patch-tests_test-convert-cvs-detectmerge.t,v 1.1 2014/12/28 17:16:54 wiz Exp $
+
+Fix cvs-specific tests with cvs-1.12.
+http://bz.selenic.com/show_bug.cgi?id=4482
+
+--- tests/test-convert-cvs-detectmerge.t.orig	2014-12-18 20:59:22.000000000 +0000
++++ tests/test-convert-cvs-detectmerge.t
+@@ -31,7 +31,6 @@ XXX copied from test-convert-cvs-synthet
+ 
+ create cvs repository with one project
+ 
+-  $ mkdir cvsrepo
+   $ cvscall -q -d "$CVSROOT" init
+   $ mkdir cvsrepo/proj
+ 
diff --git a/devel/py-mercurial/patches/patch-tests_test-convert-cvs-synthetic.t b/devel/py-mercurial/patches/patch-tests_test-convert-cvs-synthetic.t
new file mode 100644
index 00000000000..8446ac09d50
--- /dev/null
+++ b/devel/py-mercurial/patches/patch-tests_test-convert-cvs-synthetic.t
@@ -0,0 +1,15 @@
+$NetBSD: patch-tests_test-convert-cvs-synthetic.t,v 1.1 2014/12/28 17:16:54 wiz Exp $
+
+Fix cvs-specific tests with cvs-1.12.
+http://bz.selenic.com/show_bug.cgi?id=4482
+
+--- tests/test-convert-cvs-synthetic.t.orig	2014-12-18 20:59:22.000000000 +0000
++++ tests/test-convert-cvs-synthetic.t
+@@ -14,6 +14,7 @@ create cvs repository with one project
+   $ CVS_OPTIONS=-f
+   $ export CVS_OPTIONS
+   $ cd ..
++  $ rmdir cvsrepo
+   $ cvscall()
+   > {
+   >     cvs -f "$@"
diff --git a/devel/py-mercurial/patches/patch-tests_test-convert-cvs.t b/devel/py-mercurial/patches/patch-tests_test-convert-cvs.t
new file mode 100644
index 00000000000..75cf3ee75df
--- /dev/null
+++ b/devel/py-mercurial/patches/patch-tests_test-convert-cvs.t
@@ -0,0 +1,15 @@
+$NetBSD: patch-tests_test-convert-cvs.t,v 1.1 2014/12/28 17:16:54 wiz Exp $
+
+Fix cvs-specific tests with cvs-1.12.
+http://bz.selenic.com/show_bug.cgi?id=4482
+
+--- tests/test-convert-cvs.t.orig	2014-12-18 20:59:22.000000000 +0000
++++ tests/test-convert-cvs.t
+@@ -31,6 +31,7 @@ create cvs repository
+   $ CVS_OPTIONS=-f
+   $ export CVS_OPTIONS
+   $ cd ..
++  $ rmdir cvsrepo
+   $ cvscall -q -d "$CVSROOT" init
+ 
+ create source directory
diff --git a/devel/py-mercurial/patches/patch-tests_test-convert-cvsnt-mergepoints.t b/devel/py-mercurial/patches/patch-tests_test-convert-cvsnt-mergepoints.t
new file mode 100644
index 00000000000..a809a4695c6
--- /dev/null
+++ b/devel/py-mercurial/patches/patch-tests_test-convert-cvsnt-mergepoints.t
@@ -0,0 +1,15 @@
+$NetBSD: patch-tests_test-convert-cvsnt-mergepoints.t,v 1.1 2014/12/28 17:16:54 wiz Exp $
+
+Fix cvs-specific tests with cvs-1.12.
+http://bz.selenic.com/show_bug.cgi?id=4482
+
+--- tests/test-convert-cvsnt-mergepoints.t.orig	2014-12-18 20:59:22.000000000 +0000
++++ tests/test-convert-cvsnt-mergepoints.t
+@@ -32,6 +32,7 @@ create cvs repository
+   $ CVS_OPTIONS=-f
+   $ export CVS_OPTIONS
+   $ cd ..
++  $ rmdir cvsmaster
+   $ filterpath cvscall -Q -d "$CVSROOT" init
+ 
+ checkout #1: add foo.txt