Mercurial > public > mercurial-scm > hg

diff tests/test-convert-svn-sink.t @ 17014:50fbe9063ff2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tests: convert some 'hghave no-outer-repo' to #if In some places we instead use 'hg init' to create a well-known outer repo without any special extensions or other config settings.
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 20 Jun 2012 23:41:21 +0200
parents b6fd2f8909ff
children 0413f68da85c
line wrap: on
line diff
--- a/tests/test-convert-svn-sink.t	Wed Jun 20 12:30:16 2012 -0500
+++ b/tests/test-convert-svn-sink.t	Wed Jun 20 23:41:21 2012 +0200
@@ -1,4 +1,4 @@
-  $ "$TESTDIR/hghave" svn13 no-outer-repo || exit 80
+  $ "$TESTDIR/hghave" svn13 || exit 80
 
   $ fixpath()
   > {
@@ -356,7 +356,7 @@
   use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
   [1]
   $ hg --cwd b revert -r 2 b
-  $ hg resolve -m b
+  $ hg --cwd b resolve -m b
   $ hg --cwd b ci -d '5 0' -m 'merge'
 
 Expect 4 changes