Mercurial > evolve
comparison tests/test-sharing.t @ 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 | 9f42f819267b |
| children | 6d48ad81e7b5 |
comparison
equal
deleted
inserted
replaced
| 2565:76192fb97342 | 2566:f6821f6bf73c |
|---|---|
| 87 adding manifests | 87 adding manifests |
| 88 adding file changes | 88 adding file changes |
| 89 added 1 changesets with 1 changes to 1 files (+1 heads) | 89 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 90 2 new obsolescence markers | 90 2 new obsolescence markers |
| 91 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 91 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 92 updated to "60ffde5765c5: fix bug 37" | |
| 92 1 other heads for branch "default" | 93 1 other heads for branch "default" |
| 93 | 94 |
| 94 Figure SG03 | 95 Figure SG03 |
| 95 $ hg shortlog --hidden -G | 96 $ hg shortlog --hidden -G |
| 96 @ 2:60ffde5765c5 draft fix bug 37 | 97 @ 2:60ffde5765c5 draft fix bug 37 |
| 118 | 119 |
| 119 Figure SG04 (test-repo) | 120 Figure SG04 (test-repo) |
| 120 $ cd ../test-repo | 121 $ cd ../test-repo |
| 121 $ hg update | 122 $ hg update |
| 122 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 123 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 124 updated to "de6151c48e1c: fix bug 37" | |
| 123 1 other heads for branch "default" | 125 1 other heads for branch "default" |
| 124 $ hg shortlog --hidden -G | 126 $ hg shortlog --hidden -G |
| 125 @ 4:de6151c48e1c draft fix bug 37 | 127 @ 4:de6151c48e1c draft fix bug 37 |
| 126 | | 128 | |
| 127 | x 3:60ffde5765c5 draft fix bug 37 | 129 | x 3:60ffde5765c5 draft fix bug 37 |