Mercurial > hg

diff contrib/python3-whitelist @ 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 fed5e57c8dc7
children 6309128ff61f
line wrap: on
line diff
--- 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