Mercurial > evolve
changeset 2566:f6821f6bf73c
test-update: update hg update output in test files
Following hg revision 1b5c61d38a52, hg update now show the commit to which we
updated in case of multiple heads. test-obsolete.t and test-sharing.t falls in
these situations, acknowledge the new outputted line.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 15 Jun 2017 14:44:45 +0200 |
| parents | 76192fb97342 |
| children | 6eb87513024b |
| files | tests/test-obsolete.t tests/test-sharing.t |
| diffstat | 2 files changed, 3 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-obsolete.t Thu Jun 15 14:36:54 2017 +0200 +++ b/tests/test-obsolete.t Thu Jun 15 14:44:45 2017 +0200 @@ -455,6 +455,7 @@ 1 files updated, 0 files merged, 0 files removed, 0 files unresolved $ hg up 3 files updated, 0 files merged, 0 files removed, 0 files unresolved + updated to "159dfc9fa5d3: add obsol_d''" 1 other heads for branch "default" $ hg id -n 8
--- a/tests/test-sharing.t Thu Jun 15 14:36:54 2017 +0200 +++ b/tests/test-sharing.t Thu Jun 15 14:44:45 2017 +0200 @@ -89,6 +89,7 @@ added 1 changesets with 1 changes to 1 files (+1 heads) 2 new obsolescence markers 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + updated to "60ffde5765c5: fix bug 37" 1 other heads for branch "default" Figure SG03 @@ -120,6 +121,7 @@ $ cd ../test-repo $ hg update 1 files updated, 0 files merged, 0 files removed, 0 files unresolved + updated to "de6151c48e1c: fix bug 37" 1 other heads for branch "default" $ hg shortlog --hidden -G @ 4:de6151c48e1c draft fix bug 37