Mercurial > hg

changeset 8285:262738574aff

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge with crew-stable
author Patrick Mezard <pmezard@gmail.com>
date Sun, 03 May 2009 13:49:04 +0200
parents 36c704b0e7ab (current diff) 6486fb03be7c (diff)
children 707bc82ba0d7
files
diffstat 2 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-convert-baz	Sun May 03 10:38:08 2009 +0300
+++ b/tests/test-convert-baz	Sun May 03 13:49:04 2009 +0200
@@ -29,7 +29,8 @@
 cd src
 dd count=1 if=/dev/zero of=b > /dev/null 2> /dev/null
 baz add b
-baz commit -s "added a file, src and src/b (binary)"
+# HACK: hide GNU tar-1.22 "tar: The --preserve option is deprecated, use --preserve-permissions --preserve-order instead"
+baz commit -s "added a file, src and src/b (binary)" 2>&1 | grep -v ^tar
 
 echo % create link file and modify a
 ln -s ../a a-link
--- a/tests/test-glog	Sun May 03 10:38:08 2009 +0300
+++ b/tests/test-glog	Sun May 03 13:49:04 2009 +0200
@@ -170,6 +170,6 @@
 cd ..
 hg clone -U -r31 repo repo2
 cd repo2
-hg incoming -q --graph | sed -e 's|$HGTMP|[HGTMP]|'
+hg incoming -q --graph
 cd ..
 hg -R repo outgoing --graph repo2