# HG changeset patch # User Boris Feld # Date 1497530685 -7200 # Node ID f6821f6bf73c2cfa2b3fe61ee81ed19effe6ec01 # Parent 76192fb973425ff9a6da75cf28b30c6803f023e1 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. diff -r 76192fb97342 -r f6821f6bf73c tests/test-obsolete.t --- 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 diff -r 76192fb97342 -r f6821f6bf73c tests/test-sharing.t --- 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