diff --git a/contrib/python3-whitelist b/contrib/python3-whitelist --- a/contrib/python3-whitelist +++ b/contrib/python3-whitelist @@ -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 --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/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