Patchwork [1,of,5,v2] hghave: update cvs112 description

login
register
mail settings
Submitter timeless@mozdev.org
Date April 1, 2016, 10:25 p.m.
Message ID <0b49a4a6a7e2d139727f.1459549521@waste.org>
Download mbox | patch
Permalink /patch/14239/
State Superseded
Commit 45954a251a4010f189f56e9e9ec291d792a76855
Headers show

Comments

timeless@mozdev.org - April 1, 2016, 10:25 p.m.
# HG changeset patch
# User timeless <timeless@mozdev.org>
# Date 1459516798 0
#      Fri Apr 01 13:19:58 2016 +0000
# Node ID 0b49a4a6a7e2d139727fdf172f2242238733564b
# Parent  ff0d3b6b287f89594bd8d0308fe2810d2a18ea01
hghave: update cvs112 description
Pierre-Yves David - April 3, 2016, 8:50 p.m.
On 04/01/2016 03:25 PM, timeless wrote:
> # HG changeset patch
> # User timeless <timeless@mozdev.org>
> # Date 1459516798 0
> #      Fri Apr 01 13:19:58 2016 +0000
> # Node ID 0b49a4a6a7e2d139727fdf172f2242238733564b
> # Parent  ff0d3b6b287f89594bd8d0308fe2810d2a18ea01
> hghave: update cvs112 description

Can you elaborate, I'm not sure what is going on here.

You are adding a reference to cvsnt and dropping the '>=' but that all I 
get from this.

>
> diff --git a/tests/hghave.py b/tests/hghave.py
> --- a/tests/hghave.py
> +++ b/tests/hghave.py
> @@ -111,7 +111,7 @@
>       re = r'Concurrent Versions System.*?server'
>       return matchoutput('cvs --version 2>&1', re) and not has_msys()
>
> -@check("cvs112", "cvs client/server >= 1.12")
> +@check("cvs112", "cvs client/server 1.12.* (not cvsnt)")
>   def has_cvs112():
>       re = r'Concurrent Versions System \(CVS\) 1.12.*?server'
>       return matchoutput('cvs --version 2>&1', re) and not has_msys()

Patch

diff --git a/tests/hghave.py b/tests/hghave.py
--- a/tests/hghave.py
+++ b/tests/hghave.py
@@ -111,7 +111,7 @@ 
     re = r'Concurrent Versions System.*?server'
     return matchoutput('cvs --version 2>&1', re) and not has_msys()
 
-@check("cvs112", "cvs client/server >= 1.12")
+@check("cvs112", "cvs client/server 1.12.* (not cvsnt)")
 def has_cvs112():
     re = r'Concurrent Versions System \(CVS\) 1.12.*?server'
     return matchoutput('cvs --version 2>&1', re) and not has_msys()