# HG changeset patch # User Augie Fackler <raf@durin42.com> # Date 1387040409 18000 # Sat Dec 14 12:00:09 2013 -0500 # Node ID 655723de2a42221e74d79ee295d9943f4844d120 # Parent 3c3d18dae4f5e405817b92a1b728b9aaba8b86e4 test-subrepos.t: hide output from newer hg versions about active bookmarks diff --git a/tests/test-subrepos.t b/tests/test-subrepos.t --- 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 ..