Patchwork D1545: tests: fix regex in test-subrepo-git.t to match entire string

login
register
mail settings
Submitter phabricator
Date Nov. 30, 2017, 12:58 p.m.
Message ID <08f767cf8d350959917406add33c82b8@localhost.localdomain>
Download mbox | patch
Permalink /patch/25827/
State Not Applicable
Headers show

Comments

phabricator - Nov. 30, 2017, 12:58 p.m.
This revision was automatically updated to reflect the committed changes.
Closed by commit rHG4c04fd032af6: tests: fix regex in test-subrepo-git.t to match entire string (authored by martinvonz, committed by ).

REPOSITORY
  rHG Mercurial

CHANGES SINCE LAST UPDATE
  https://phab.mercurial-scm.org/D1545?vs=3964&id=4011

REVISION DETAIL
  https://phab.mercurial-scm.org/D1545

AFFECTED FILES
  tests/test-subrepo-git.t

CHANGE DETAILS




To: martinvonz, #hg-reviewers, quark, yuja
Cc: mercurial-devel

Patch

diff --git a/tests/test-subrepo-git.t b/tests/test-subrepo-git.t
--- a/tests/test-subrepo-git.t
+++ b/tests/test-subrepo-git.t
@@ -847,8 +847,8 @@ 
 the output contains a regex, because git 1.7.10 and 1.7.11
  change the amount of whitespace
   $ hg diff --subrepos --stat
-  \s*barfoo |\s*1 + (re)
-  \s*foobar |\s*2 +- (re)
+  \s*barfoo \|\s+1 \+ (re)
+  \s*foobar \|\s+2 \+- (re)
    2 files changed, 2 insertions\(\+\), 1 deletions?\(-\) (re)
 
 adding an include should ignore the other elements