changeset 626:655723de2a42

test-subrepos.t: hide output from newer hg versions about active bookmarks
author Augie Fackler <raf@durin42.com>
date Sat, 14 Dec 2013 12:00:09 -0500
parents 3c3d18dae4f5
children ef41e87ea11a
files tests/test-subrepos.t
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-subrepos.t
+++ b/tests/test-subrepos.t
@@ -102,8 +102,9 @@
   pulling from $TESTTMP/gitrepo1
   importing git objects into hg
   (run 'hg update' to get a working copy)
-  $ hg checkout -C
-  updating to active bookmark master
+We grep off the updating to active bookmark message from newer versions. When
+only 2.7 or later (or so) is supported, this grep should be dropped.
+  $ hg checkout -C | grep -v 'updating to active bookmark master'
   cloning subrepo hgsub from $TESTTMP/hgsub
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd ..