Mercurial > hg
comparison tests/test-rebase-conflicts.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 | 50f5fc232c16 |
children | 70b71421fd33 |
comparison
equal
deleted
inserted
replaced
39479:3ba87d5b9ad3 | 39480:89630d0b3e23 |
---|---|
153 $ hg unbundle "$TESTDIR/bundles/issue4041.hg" | 153 $ hg unbundle "$TESTDIR/bundles/issue4041.hg" |
154 adding changesets | 154 adding changesets |
155 adding manifests | 155 adding manifests |
156 adding file changes | 156 adding file changes |
157 added 11 changesets with 8 changes to 3 files (+1 heads) | 157 added 11 changesets with 8 changes to 3 files (+1 heads) |
158 new changesets 24797d4f68de:2f2496ddf49d | 158 new changesets 24797d4f68de:2f2496ddf49d (11 drafts) |
159 (run 'hg heads' to see heads) | 159 (run 'hg heads' to see heads) |
160 $ hg up default | 160 $ hg up default |
161 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 161 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
162 $ hg log -G | 162 $ hg log -G |
163 o changeset: 10:2f2496ddf49d | 163 o changeset: 10:2f2496ddf49d |