Mercurial > hg > hg-git
changeset 730:371e62e7cacd
tests: fix further breakage due to upstream output changes
Mercurial changesets 10f15e34d86c and ca275f7ec576 added messages when
bookmarks are activated and deactivated, respectively.
| author | Siddharth Agarwal <sid0@fb.com> |
|---|---|
| date | Mon, 26 May 2014 18:37:09 -0700 |
| parents | 2f8bedc6007d |
| children | 381a135a9548 |
| files | tests/test-git-workflow.t tests/test-hg-author.t tests/test-hg-branch.t tests/test-hg-tags-invalid.t tests/test-hg-tags.t tests/test-push.t tests/test-subrepos.t |
| diffstat | 7 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-git-workflow.t +++ b/tests/test-git-workflow.t @@ -29,7 +29,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd gitrepo $ hg book master - $ hg up null + $ hg up null | egrep -v '^\(leaving bookmark master\)$' 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ echo "[git]" >> .hg/hgrc $ echo "intree = True" >> .hg/hgrc
--- a/tests/test-hg-author.t +++ b/tests/test-hg-author.t @@ -16,7 +16,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd hgrepo - $ hg co master + $ hg co master | egrep -v '^\(activating bookmark master\)$' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ echo beta > beta $ hg add beta
--- a/tests/test-hg-branch.t +++ b/tests/test-hg-branch.t @@ -16,7 +16,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd hgrepo - $ hg co master + $ hg co master | egrep -v '^\(activating bookmark master\)$' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg mv alpha beta $ fn_hg_commit -m 'rename alpha to beta'
--- a/tests/test-hg-tags-invalid.t +++ b/tests/test-hg-tags-invalid.t @@ -16,7 +16,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd hgrepo - $ hg co master + $ hg co master | egrep -v '^\(activating bookmark master\)$' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ fn_hg_tag alph#a $ fn_hg_tag bet*a
--- a/tests/test-hg-tags.t +++ b/tests/test-hg-tags.t @@ -16,7 +16,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd hgrepo - $ hg co master + $ hg co master | egrep -v '^\(activating bookmark master\)$' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ fn_hg_tag alpha $ hg push
--- a/tests/test-push.t +++ b/tests/test-push.t @@ -118,7 +118,7 @@ hg-git issue103 -- directories can lose information at hg-git export time - $ hg up master + $ hg up master | egrep -v '^\(activating bookmark master\)$' 0 files updated, 0 files merged, 0 files removed, 0 files unresolved $ mkdir dir1 $ echo alpha > dir1/alpha
--- a/tests/test-subrepos.t +++ b/tests/test-subrepos.t @@ -104,7 +104,7 @@ (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' + $ hg checkout -C | grep -v 'updating to active bookmark master' | egrep -v '^\(activating bookmark master\)$' cloning subrepo hgsub from $TESTTMP/hgsub 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd ..