Mercurial > hg-stable

changeset 23621:bb679344c88d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
keyword: update test file syntax
author Christian Ebert <blacktrash@gmx.net>
date Sun, 21 Dec 2014 12:53:57 +0000
parents 3d4aa20b775d
children cb9d845406e5
files tests/test-keyword.t
diffstat 1 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-keyword.t	Mon Dec 22 14:49:05 2014 -0600
+++ b/tests/test-keyword.t	Sun Dec 21 12:53:57 2014 +0000
@@ -184,7 +184,7 @@
   $ hg status -A --rev 3:4 i
   C i
 
-  $ hg -q strip -n 2
+  $ hg -q strip --no-backup 2
 
 Test hook execution
 
@@ -521,7 +521,7 @@
   $ head -1 a
   expand $Id: a,v 67d8c481a6be 1970/01/01 00:00:15 test $
 
-  $ hg -q strip -n tip
+  $ hg -q strip --no-backup tip
 
 Test patch queue repo
 
@@ -1064,7 +1064,7 @@
 
 resolve to local
 
-  $ HGMERGE=internal:local hg resolve -a
+  $ hg resolve -t internal:local -a
   (no more unresolved files)
   $ hg commit -m localresolve
   $ cat m