Patchwork [resend] tests: test-convert-cvs-synthetic.t requires cvs 1.12 - skip the test for 1.11

login
register
mail settings
Submitter Mads Kiilerich
Date Jan. 12, 2014, 6:58 p.m.
Message ID <f2899f281c5cbbfd0fb8.1389553103@localhost.localdomain>
Download mbox | patch
Permalink /patch/3305/
State Accepted
Commit b349e476a622bbb4709d211ae48353244cc23861
Headers show

Comments

Mads Kiilerich - Jan. 12, 2014, 6:58 p.m.
# HG changeset patch
# User Mads Kiilerich <madski@unity3d.com>
# Date 1384711929 18000
#      Sun Nov 17 13:12:09 2013 -0500
# Node ID f2899f281c5cbbfd0fb81074cec64f6bb3fd8326
# Parent  18a05dd444ccd13af0d85d7d64bbf108098043b4
tests: test-convert-cvs-synthetic.t requires cvs 1.12 - skip the test for 1.11

1b7b5975793f introduced a dependency on 'cvs 1.12 commitid'. The corresponding
test fixup in ed923a2d5ae9 missed the 'hghave cvs112' as introduced in
9589227657bc.
Pierre-Yves David - Jan. 13, 2014, 6:18 a.m.
looks good to me.

On 01/12/2014 10:58 AM, Mads Kiilerich wrote:
> # HG changeset patch
> # User Mads Kiilerich <madski@unity3d.com>
> # Date 1384711929 18000
> #      Sun Nov 17 13:12:09 2013 -0500
> # Node ID f2899f281c5cbbfd0fb81074cec64f6bb3fd8326
> # Parent  18a05dd444ccd13af0d85d7d64bbf108098043b4
> tests: test-convert-cvs-synthetic.t requires cvs 1.12 - skip the test for 1.11
>
> 1b7b5975793f introduced a dependency on 'cvs 1.12 commitid'. The corresponding
> test fixup in ed923a2d5ae9 missed the 'hghave cvs112' as introduced in
> 9589227657bc.
>
> diff --git a/tests/test-convert-cvs-synthetic.t b/tests/test-convert-cvs-synthetic.t
> --- a/tests/test-convert-cvs-synthetic.t
> +++ b/tests/test-convert-cvs-synthetic.t
> @@ -1,6 +1,6 @@
>   This feature requires use of builtin cvsps!
>   
> -  $ "$TESTDIR/hghave" cvs || exit 80
> +  $ "$TESTDIR/hghave" cvs112 || exit 80
>     $ echo "[extensions]" >> $HGRCPATH
>     $ echo "convert = " >> $HGRCPATH
>   
> _______________________________________________
> Mercurial-devel mailing list
> Mercurial-devel@selenic.com
> http://selenic.com/mailman/listinfo/mercurial-devel

Patch

diff --git a/tests/test-convert-cvs-synthetic.t b/tests/test-convert-cvs-synthetic.t
--- a/tests/test-convert-cvs-synthetic.t
+++ b/tests/test-convert-cvs-synthetic.t
@@ -1,6 +1,6 @@ 
 This feature requires use of builtin cvsps!
 
-  $ "$TESTDIR/hghave" cvs || exit 80
+  $ "$TESTDIR/hghave" cvs112 || exit 80
   $ echo "[extensions]" >> $HGRCPATH
   $ echo "convert = " >> $HGRCPATH