D5042: py3: add some glob to make output compatible with python 3
pulkit (Pulkit Goyal)
phabricator at mercurial-scm.org
Sat Oct 13 02:23:00 UTC 2018
pulkit created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
This makes test-pathconflicts-basic.t and test-origbackup-conflict.t passing
on Python 3.
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D5042
AFFECTED FILES
contrib/python3-whitelist
tests/test-origbackup-conflict.t
tests/test-pathconflicts-basic.t
CHANGE DETAILS
diff --git a/tests/test-pathconflicts-basic.t b/tests/test-pathconflicts-basic.t
--- a/tests/test-pathconflicts-basic.t
+++ b/tests/test-pathconflicts-basic.t
@@ -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
diff --git a/tests/test-origbackup-conflict.t b/tests/test-origbackup-conflict.t
--- a/tests/test-origbackup-conflict.t
+++ b/tests/test-origbackup-conflict.t
@@ -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 --git a/contrib/python3-whitelist b/contrib/python3-whitelist
--- a/contrib/python3-whitelist
+++ b/contrib/python3-whitelist
@@ -394,6 +394,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
@@ -403,6 +404,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
To: pulkit, #hg-reviewers
Cc: mercurial-devel
More information about the Mercurial-devel
mailing list