# HG changeset patch
# User Pulkit Goyal <pulkit@yandex-team.ru>
# Date 1539397048 -10800
# Node ID 0b46e1aa77609c48e77f73ef987807f4a123d6a5
# Parent  fed5e57c8dc7494a9c74e4f6bfa6b69b1b0f76e5
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

diff -r fed5e57c8dc7 -r 0b46e1aa7760 contrib/python3-whitelist
--- a/contrib/python3-whitelist	Sat Oct 13 05:14:23 2018 +0300
+++ b/contrib/python3-whitelist	Sat Oct 13 05:17:28 2018 +0300
@@ -393,6 +393,7 @@
 test-obsolete-divergent.t
 test-obsolete-tag-cache.t
 test-obsolete.t
+test-origbackup-conflict.t
 test-pager-legacy.t
 test-pager.t
 test-parents.t
@@ -402,6 +403,7 @@
 test-patchbomb-bookmark.t
 test-patchbomb-tls.t
 test-patchbomb.t
+test-pathconflicts-basic.t
 test-pathconflicts-merge.t
 test-pathconflicts-update.t
 test-pathencode.py
diff -r fed5e57c8dc7 -r 0b46e1aa7760 tests/test-origbackup-conflict.t
--- a/tests/test-origbackup-conflict.t	Sat Oct 13 05:14:23 2018 +0300
+++ b/tests/test-origbackup-conflict.t	Sat Oct 13 05:17:28 2018 +0300
@@ -129,7 +129,7 @@
   b/c: replacing untracked file
   getting b/c
   creating directory: $TESTTMP/repo/.hg/badorigbackups/b
-  abort: $ENOTDIR$: '$TESTTMP/repo/.hg/badorigbackups/b'
+  abort: $ENOTDIR$: *$TESTTMP/repo/.hg/badorigbackups/b* (glob)
   [255]
   $ cat .hg/badorigbackups
   data
diff -r fed5e57c8dc7 -r 0b46e1aa7760 tests/test-pathconflicts-basic.t
--- 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