Mercurial > hg-stable
comparison tests/test-merge10.t @ 34661:eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Upon pull or unbundle, we display a message with the range of new revisions
fetched. This revision range could readily be used after a pull to look out
what's new with 'hg log'. The algorithm takes care of filtering "obsolete"
revisions that might be present in transaction's "changes" but should not be
displayed to the end user.
| author | Denis Laxalde <denis.laxalde@logilab.fr> |
|---|---|
| date | Thu, 12 Oct 2017 09:39:50 +0200 |
| parents | f2719b387380 |
| children | faa49a5914bb |
comparison
equal
deleted
inserted
replaced
| 34660:d00ec62d156f | 34661:eb586ed5d8ce |
|---|---|
| 31 searching for changes | 31 searching for changes |
| 32 adding changesets | 32 adding changesets |
| 33 adding manifests | 33 adding manifests |
| 34 adding file changes | 34 adding file changes |
| 35 added 1 changesets with 1 changes to 1 files (+1 heads) | 35 added 1 changesets with 1 changes to 1 files (+1 heads) |
| 36 new changesets cc7000b01af9 | |
| 36 (run 'hg heads' to see heads, 'hg merge' to merge) | 37 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 37 $ hg up -C 2 | 38 $ hg up -C 2 |
| 38 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 39 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 39 $ hg merge | 40 $ hg merge |
| 40 merging testdir/subdir/a and testdir/a to testdir/subdir/a | 41 merging testdir/subdir/a and testdir/a to testdir/subdir/a |