# HG changeset patch
# User Christian Ebert <blacktrash@gmx.net>
# Date 1328969899 0
# Node ID a0451f80f66550d553e6c67b36f7d25e7e17f755
# Parent  cac01b4e4a6cdc597d2e0ec58f035b11badf4191# Parent  fcc01604f7a6c7cddfcc2d8e14c9089e3d229897
Merge with stable

diff -r cac01b4e4a6c -r a0451f80f665 tests/test-keyword.t
--- a/tests/test-keyword.t	Mon Jan 23 16:21:12 2012 +0100
+++ b/tests/test-keyword.t	Sat Feb 11 14:18:19 2012 +0000
@@ -169,10 +169,10 @@
 
 hg status of kw-ignored binary file starting with '\1\n'
 
-  $ printf '\1\nfoo' > i
+  >>> open("i", "wb").write("\1\nfoo")
   $ hg -q commit -Am metasep i
   $ hg status
-  $ printf '\1\nbar' > i
+  >>> open("i", "wb").write("\1\nbar")
   $ hg status
   M i
   $ hg -q commit -m "modify metasep" i
@@ -556,7 +556,6 @@
 Commit and show expansion in original and copy
 
   $ hg --debug commit -ma2c -d '1 0' -u 'User Name <user@example.com>'
-  invalidating branch cache (tip differs)
   c
    c: copy a:0045e12f6c5791aac80ca6cbfd97709a88307292
   overwriting c expanding keywords