Mercurial > public > mercurial-scm > hg

diff tests/test-resolve.t @ 27067:19b52cde2b84

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-resolve: fix '--tool f' invocation for Windows Windows can't invoke a python script directly, so invoke sh.exe instead. According to sid0, the output changes are due to the fact that 'f' is no longer being passed all of the args that it was, but these changes aren't essential to the test [1]. [1] https://selenic.com/pipermail/mercurial-devel/2015-November/075768.html
author Matt Harbison <matt_harbison@yahoo.com>
date Sun, 22 Nov 2015 21:20:08 -0500
parents a01ecbcfaf84
children 777f668eca70
line wrap: on
line diff
--- a/tests/test-resolve.t	Sat Nov 14 17:30:10 2015 -0800
+++ b/tests/test-resolve.t	Sun Nov 22 21:20:08 2015 -0500
@@ -221,21 +221,7 @@
 
 test .orig behavior with resolve
 
-  $ hg resolve -q file1 --tool 'f --dump $TESTTMP/repo/file1.orig'
-  */file1~base*: (glob)
-  >>>
-  foo
-  <<<
-  */file1~other*: (glob)
-  >>>
-  foo
-  bar
-  <<<
-  $TESTTMP/repo/file1: (glob)
-  >>>
-  foo
-  baz
-  <<<
+  $ hg resolve -q file1 --tool "sh -c 'f --dump \"$TESTTMP/repo/file1.orig\"'"
   $TESTTMP/repo/file1.orig: (glob)
   >>>
   foo