Mercurial > hg-stable

changeset 32698:bcb6684d144b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: adjust recent output changes for Windows
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 04 Jun 2017 20:11:59 -0400
parents f840b2621cce
children 3d488079750b
files tests/test-dirstate-race.t tests/test-subrepo.t
diffstat 2 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-dirstate-race.t	Mon May 22 21:45:02 2017 -0400
+++ b/tests/test-dirstate-race.t	Sun Jun 04 20:11:59 2017 -0400
@@ -45,7 +45,7 @@
 #endif
 
   $ hg add b dir1 d e
-  adding dir1/c
+  adding dir1/c (glob)
   $ hg commit -m test2
 
   $ cat >> $TESTTMP/dirstaterace.py << EOF
--- a/tests/test-subrepo.t	Mon May 22 21:45:02 2017 -0400
+++ b/tests/test-subrepo.t	Sun Jun 04 20:11:59 2017 -0400
@@ -1020,12 +1020,12 @@
   $ hg cat sub/repo/foo
   test
   test
-  $ hg cat sub/repo/foo -Tjson
+  $ hg cat sub/repo/foo -Tjson | sed 's|\\\\|/|g'
   [
    {
     "abspath": "foo",
     "data": "test\ntest\n",
-    "path": "sub/repo/foo" (glob)
+    "path": "sub/repo/foo"
    }
   ]
   $ mkdir -p tmp/sub/repo