Mercurial > hg
changeset 36992:ccc2d5f10421
tests: stop over-specifying tempfile name
Python 3 has more random characters in the default template, which is fine.
Differential Revision: https://phab.mercurial-scm.org/D2676
| author | Augie Fackler <augie@google.com> |
|---|---|
| date | Sun, 04 Mar 2018 16:23:03 -0500 |
| parents | d683c7367989 |
| children | f4c7dc24e889 |
| files | contrib/python3-whitelist tests/test-merge-tools.t |
| diffstat | 2 files changed, 2 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/contrib/python3-whitelist Sat Mar 10 23:58:01 2018 -0500 +++ b/contrib/python3-whitelist Sun Mar 04 16:23:03 2018 -0500 @@ -217,6 +217,7 @@ test-merge-revert2.t test-merge-subrepos.t test-merge-symlinks.t +test-merge-tools.t test-merge-types.t test-merge1.t test-merge10.t
--- a/tests/test-merge-tools.t Sat Mar 10 23:58:01 2018 -0500 +++ b/tests/test-merge-tools.t Sun Mar 04 16:23:03 2018 -0500 @@ -1558,7 +1558,7 @@ $ hg update -q -C 2 $ hg merge -y -r tip --tool echo --config merge-tools.echo.args='$base $local $other $output' merging f and f.txt to f.txt - */f~base.?????? $TESTTMP/f.txt.orig */f~other.??????.txt $TESTTMP/f.txt (glob) + */f~base.* $TESTTMP/f.txt.orig */f~other.*.txt $TESTTMP/f.txt (glob) 0 files updated, 1 files merged, 0 files removed, 0 files unresolved (branch merge, don't forget to commit)