Mercurial > public > mercurial-scm > hg-stable

diff tests/test-pathconflicts-basic.t @ 40230:0b46e1aa7760

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
py3: add some glob to make output compatible with python 3 This makes test-pathconflicts-basic.t and test-origbackup-conflict.t passing on Python 3. Differential Revision: https://phab.mercurial-scm.org/D5042
author Pulkit Goyal <pulkit@yandex-team.ru>
date Sat, 13 Oct 2018 05:17:28 +0300
parents 41ef02ba329b
children dc00324e80f4
line wrap: on
line diff
--- a/tests/test-pathconflicts-basic.t	Sat Oct 13 05:14:23 2018 +0300
+++ b/tests/test-pathconflicts-basic.t	Sat Oct 13 05:17:28 2018 +0300
@@ -88,7 +88,7 @@
   $ mkdir a
   $ echo 4 > a/b
   $ hg up file2
-  abort: *: '$TESTTMP/repo/a' (glob)
+  abort: *: *$TESTTMP/repo/a* (glob)
   [255]
   $ hg up --clean file2
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved