Mercurial > hg

diff tests/test-merge1.t @ 39593:c8514f858788

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: stabilize change for handling not quoting non-empty-directory The change originated in cb1329738d64. I suspect the problem is with the combination of (re) and the '\' to '/' retry on Windows. I've no idea if py3 on Windows needs the quoting, since it can't even run `hg` with no arguments. (It's dying somewhere on the ctype declarations when win32.py is imported.)
author Matt Harbison <matt_harbison@yahoo.com>
date Wed, 12 Sep 2018 23:10:59 -0400
parents cb1329738d64
children 07e181ed82ef
line wrap: on
line diff
--- a/tests/test-merge1.t	Tue Aug 21 15:25:46 2018 -0400
+++ b/tests/test-merge1.t	Wed Sep 12 23:10:59 2018 -0400
@@ -30,7 +30,7 @@
 
   $ mkdir b && touch b/nonempty
   $ hg up
-  abort: Unlinking directory not permitted: '?\$TESTTMP/t/b'? (re) (windows !)
+  abort: Unlinking directory not permitted: *$TESTTMP/t/b* (glob) (windows !)
   abort: Directory not empty: '?\$TESTTMP/t/b'? (re) (no-windows !)
   [255]
   $ hg ci