Skip to content
Snippets Groups Projects
Commit 0b46e1aa authored by Pulkit Goyal's avatar Pulkit Goyal
Browse files

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
parent fed5e57c
No related branches found
No related tags found
No related merge requests found
......@@ -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
......
......@@ -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
......
......@@ -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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment