Mercurial > hg

diff tests/test-rebase-conflicts.t @ 39480:89630d0b3e23

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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
line wrap: on
line diff
--- a/tests/test-rebase-conflicts.t	Fri Sep 07 23:54:42 2018 -0400
+++ b/tests/test-rebase-conflicts.t	Thu Aug 30 01:53:21 2018 +0200
@@ -155,7 +155,7 @@
   adding manifests
   adding file changes
   added 11 changesets with 8 changes to 3 files (+1 heads)
-  new changesets 24797d4f68de:2f2496ddf49d
+  new changesets 24797d4f68de:2f2496ddf49d (11 drafts)
   (run 'hg heads' to see heads)
   $ hg up default
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved