Patchwork [1,of,2] keyword: update test file syntax

login
register
mail settings
Submitter Christian Ebert
Date Dec. 21, 2014, 11:52 p.m.
Message ID <a43065a3286da13b13c5.1419205933@1.0.0.127.in-addr.arpa>
Download mbox | patch
Permalink /patch/7188/
State Accepted
Headers show

Comments

Christian Ebert - Dec. 21, 2014, 11:52 p.m.
# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1419166437 0
#      Sun Dec 21 12:53:57 2014 +0000
# Node ID a43065a3286da13b13c52405d080230e5cf32002
# Parent  7b8ff3fd11d39bd809fc65c628d65045502178cc
keyword: update test file syntax

Patch

diff --git a/tests/test-keyword.t b/tests/test-keyword.t
--- a/tests/test-keyword.t
+++ b/tests/test-keyword.t
@@ -184,7 +184,7 @@  hg status of kw-ignored binary file star
   $ 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 @@  amend
   $ 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 @@  conflict: keyword should stay outside co
 
 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