Mercurial > hg > hg-git
changeset 969:270962e56813
test-subrepos.t: clean up compat cruft
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Thu, 31 Dec 2015 13:01:03 -0800 |
| parents | 1bdabf776172 |
| children | a7956bcbffe1 |
| files | tests/test-subrepos.t |
| diffstat | 1 files changed, 2 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-subrepos.t +++ b/tests/test-subrepos.t @@ -102,9 +102,8 @@ pulling from $TESTTMP/gitrepo1 importing git objects into hg (run 'hg update' to get a working copy) -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' | egrep -v '^\(activating bookmark master\)$' + $ hg checkout -C | egrep -v '^\(activating bookmark master\)$' + updating to active bookmark master cloning subrepo hgsub from $TESTTMP/hgsub 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd ..