Mercurial > hg
comparison tests/test-rebase-obsolete.t @ 39480:89630d0b3e23
phase: report number of non-public changeset alongside the new range
When interacting with non-publishing repository or bundle, it is useful to
have some information about the phase of the changeset we just pulled.
This changeset updates the "new changesets MIN:MAX" output to also includes
phases information for non-public changesets. Displaying extra data about
non-public changesets means the output for exchange with publishing repository
(the default) is unaffected.
| author | Boris Feld <boris.feld@octobus.net> |
|---|---|
| date | Thu, 30 Aug 2018 01:53:21 +0200 |
| parents | 94a4980695f8 |
| children | 208303a8172c |
comparison
equal
deleted
inserted
replaced
| 39479:3ba87d5b9ad3 | 39480:89630d0b3e23 |
|---|---|
| 25 $ hg unbundle "$TESTDIR/bundles/rebase.hg" | 25 $ hg unbundle "$TESTDIR/bundles/rebase.hg" |
| 26 adding changesets | 26 adding changesets |
| 27 adding manifests | 27 adding manifests |
| 28 adding file changes | 28 adding file changes |
| 29 added 8 changesets with 7 changes to 7 files (+2 heads) | 29 added 8 changesets with 7 changes to 7 files (+2 heads) |
| 30 new changesets cd010b8cd998:02de42196ebe | 30 new changesets cd010b8cd998:02de42196ebe (8 drafts) |
| 31 (run 'hg heads' to see heads, 'hg merge' to merge) | 31 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 32 $ hg up tip | 32 $ hg up tip |
| 33 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 33 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 34 $ hg log -G | 34 $ hg log -G |
| 35 @ 7:02de42196ebe H | 35 @ 7:02de42196ebe H |
| 573 $ hg unbundle "$TESTDIR/bundles/rebase.hg" | 573 $ hg unbundle "$TESTDIR/bundles/rebase.hg" |
| 574 adding changesets | 574 adding changesets |
| 575 adding manifests | 575 adding manifests |
| 576 adding file changes | 576 adding file changes |
| 577 added 8 changesets with 7 changes to 7 files (+2 heads) | 577 added 8 changesets with 7 changes to 7 files (+2 heads) |
| 578 new changesets cd010b8cd998:02de42196ebe | 578 new changesets cd010b8cd998:02de42196ebe (8 drafts) |
| 579 (run 'hg heads' to see heads, 'hg merge' to merge) | 579 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 580 $ hg up 3 | 580 $ hg up 3 |
| 581 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | 581 4 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 582 $ hg merge 7 | 582 $ hg merge 7 |
| 583 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 583 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |