Mercurial > evolve

changeset 4181:ab3581bc0637

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
branching: preserve the expected output on default
author Pierre-Yves David <pierre-yves.david@octobus.net>
date Wed, 17 Oct 2018 13:44:06 +0200
parents 3c28f8a3a5a5 (diff) 8eec9422bd8e (current diff)
children 4d30cb45b57f
files tests/test-corrupt.t tests/test-discovery-obshashrange.t tests/test-evolve-content-divergence.t tests/test-evolve-obshistory.t tests/test-evolve-phase-divergence.t tests/test-evolve-serveronly-bundle2.t tests/test-evolve-templates.t tests/test-evolve.t tests/test-exchange-obsmarkers-case-A1.t tests/test-exchange-obsmarkers-case-A2.t tests/test-exchange-obsmarkers-case-A3.t tests/test-exchange-obsmarkers-case-A4.t tests/test-exchange-obsmarkers-case-A5.t tests/test-exchange-obsmarkers-case-B3.t tests/test-exchange-obsmarkers-case-B5.t tests/test-exchange-obsmarkers-case-C2.t tests/test-exchange-obsmarkers-case-D1.t tests/test-exchange-obsmarkers-case-D4.t tests/test-obsolete.t tests/test-options.t tests/test-prev-next.t tests/test-push-checkheads-partial-C1.t tests/test-push-checkheads-partial-C2.t tests/test-push-checkheads-partial-C3.t tests/test-push-checkheads-partial-C4.t tests/test-push-checkheads-pruned-B2.t tests/test-push-checkheads-pruned-B3.t tests/test-push-checkheads-pruned-B4.t tests/test-push-checkheads-pruned-B5.t tests/test-push-checkheads-pruned-B8.t tests/test-push-checkheads-superceed-A2.t tests/test-push-checkheads-superceed-A3.t tests/test-push-checkheads-superceed-A6.t tests/test-push-checkheads-superceed-A7.t tests/test-push-checkheads-unpushed-D2.t tests/test-push-checkheads-unpushed-D3.t tests/test-push-checkheads-unpushed-D4.t tests/test-push-checkheads-unpushed-D5.t tests/test-sharing.t tests/test-topic-dest.t tests/test-topic-tutorial.t tests/test-topic.t tests/test-tutorial.t tests/test-wireproto-bundle1.t tests/test-wireproto.t
diffstat 45 files changed, 83 insertions(+), 149 deletions(-) [+]
line wrap: on
line diff
--- a/tests/test-corrupt.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-corrupt.t	Wed Oct 17 13:44:06 2018 +0200
@@ -60,7 +60,7 @@
   checking manifests
   crosschecking files in changesets and manifests
   checking files
-  13 files, 3 changesets, 13 total revisions
+  checked 3 changesets with 13 changes to 13 files
   $ mkcommit D
   $ mkcommit E
   $ hg up -q .^^
@@ -115,7 +115,7 @@
   checking manifests
   crosschecking files in changesets and manifests
   checking files
-  15 files, 4 changesets, 15 total revisions
+  checked 4 changesets with 15 changes to 15 files
 
 
 
--- a/tests/test-discovery-obshashrange.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-discovery-obshashrange.t	Wed Oct 17 13:44:06 2018 +0200
@@ -319,7 +319,7 @@
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending hello command (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending between command (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: * (glob)
-  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob)
+  * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: capabilities: _evoext_getbundle_obscommon _evoext_obshash_0 _evoext_obshash_1 _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache%0Astream%3Dv2 changegroupsubset getbundle known lookup protocaps pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> remote: 1 (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> sending protocaps command (glob)
   * @45f8b879de922f6a6e620ba04205730335b6fc7e (*)> preparing listkeys for "phases" (glob)
--- a/tests/test-evolve-content-divergence.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-evolve-content-divergence.t	Wed Oct 17 13:44:06 2018 +0200
@@ -793,7 +793,7 @@
   adding manifests
   adding file changes
   added 5 changesets with 5 changes to 5 files
-  new changesets 8fa14d15e168:c41c793e0ef1
+  new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts)
   (run 'hg update' to get a working copy)
   $ hg glog
   o  4:c41c793e0ef1 added d
@@ -865,7 +865,7 @@
   added 4 changesets with 0 changes to 4 files (+1 heads)
   5 new obsolescence markers
   8 new content-divergent changesets
-  new changesets 82b74d5dc678:15c781f93cac
+  new changesets 82b74d5dc678:15c781f93cac (4 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg glog
--- a/tests/test-evolve-obshistory.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-evolve-obshistory.t	Wed Oct 17 13:44:06 2018 +0200
@@ -126,7 +126,7 @@
   added 1 changesets with 0 changes to 1 files (+1 heads)
   2 new obsolescence markers
   obsoleted 1 changesets
-  new changesets 7a230b46bf61
+  new changesets 7a230b46bf61 (1 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: 7a230b46bf61)
--- a/tests/test-evolve-phase-divergence.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-evolve-phase-divergence.t	Wed Oct 17 13:44:06 2018 +0200
@@ -80,7 +80,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets 4d1169d82e47
+  new changesets 4d1169d82e47 (1 drafts)
   (run 'hg update' to get a working copy)
 
   $ hg glog
@@ -260,7 +260,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets aa071e5554e3
+  new changesets aa071e5554e3 (1 drafts)
   (run 'hg update' to get a working copy)
 
   $ hg push ../public
@@ -414,7 +414,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets b756eb10ea73
+  new changesets b756eb10ea73 (1 drafts)
   1 local changesets published
   (run 'hg update' to get a working copy)
 
@@ -545,7 +545,7 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files
   2 new obsolescence markers
-  new changesets 502e73736632:2352021b3785
+  new changesets 502e73736632:2352021b3785 (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg push ../public
   pushing to ../public
--- a/tests/test-evolve-serveronly-bundle2.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-evolve-serveronly-bundle2.t	Wed Oct 17 13:44:06 2018 +0200
@@ -72,7 +72,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  new changesets 8685c6d34325:4957bfdac07e
+  new changesets 8685c6d34325:4957bfdac07e (2 drafts)
   (run 'hg update' to get a working copy)
   $ cat ../errors.log
   $ hg push -R ../other
@@ -130,7 +130,7 @@
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   1 new obsolescence markers
   obsoleted 1 changesets
-  new changesets 9d1c114e7797
+  new changesets 9d1c114e7797 (1 drafts)
   (run 'hg heads' to see heads)
   $ cat ../errors.log
   $ hg -R ../other pull
--- a/tests/test-evolve-templates.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-evolve-templates.t	Wed Oct 17 13:44:06 2018 +0200
@@ -1004,7 +1004,7 @@
   added 1 changesets with 0 changes to 1 files (+1 heads)
   2 new obsolescence markers
   obsoleted 1 changesets
-  new changesets 7a230b46bf61
+  new changesets 7a230b46bf61 (1 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   working directory parent is obsolete! (471f378eab4c)
   (use 'hg evolve' to update to its successor: 7a230b46bf61)
--- a/tests/test-evolve.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-evolve.t	Wed Oct 17 13:44:06 2018 +0200
@@ -380,8 +380,8 @@
   $ hg up -r "desc('a nifty feature')"
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
   $ hg revert -r "desc('another feature')" --all
+  reverting main-file-1
   adding file-from-B
-  reverting main-file-1
   $ sed -i'' -e s/Zwei/deux/ main-file-1
   $ hg commit -m 'another feature that rox' -o 5
   created new head
@@ -507,7 +507,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets 702e4d0a6d86
+  new changesets 702e4d0a6d86 (1 drafts)
   $ cd alpha
 
   $ cat << EOF > A
@@ -540,7 +540,7 @@
   checking manifests
   crosschecking files in changesets and manifests
   checking files
-  3 files, 3 changesets, 3 total revisions
+  checked 3 changesets with 3 changes to 3 files
   $ hg --config extensions.hgext.mq= strip 'extinct()'
   abort: empty revision set
   [255]
@@ -552,7 +552,7 @@
   checking manifests
   crosschecking files in changesets and manifests
   checking files
-  2 files, 2 changesets, 2 total revisions
+  checked 2 changesets with 2 changes to 2 files
   $ cd ..
 
 Clone just this branch
@@ -566,7 +566,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
-  new changesets c6dda801837c
+  new changesets c6dda801837c (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg up
   2 files updated, 0 files merged, 0 files removed, 0 files unresolved
@@ -1163,55 +1163,11 @@
   > EOF
   $ hg next
   hg: unknown command 'next'
-  Mercurial Distributed SCM
-  
-  basic commands:
-  
-   add           add the specified files on the next commit
-   annotate      show changeset information by line for each file
-   clone         make a copy of an existing repository
-   commit        commit the specified files or all outstanding changes
-   diff          diff repository (or selected files)
-   export        dump the header and diffs for one or more changesets
-   forget        forget the specified files on the next commit
-   init          create a new repository in the given directory
-   log           show revision history of entire repository or files
-   merge         merge another revision into working directory
-   pull          pull changes from the specified source
-   push          push changes to the specified destination
-   remove        remove the specified files on the next commit
-   serve         start stand-alone webserver
-   status        show changed files in the working directory
-   summary       summarize working directory state
-   update        update working directory (or switch revisions)
-  
-  (use 'hg help' for the full list of commands or 'hg -v' for details)
+  (use 'hg help' for a list of commands)
   [255]
   $ hg fold
   hg: unknown command 'fold'
-  Mercurial Distributed SCM
-  
-  basic commands:
-  
-   add           add the specified files on the next commit
-   annotate      show changeset information by line for each file
-   clone         make a copy of an existing repository
-   commit        commit the specified files or all outstanding changes
-   diff          diff repository (or selected files)
-   export        dump the header and diffs for one or more changesets
-   forget        forget the specified files on the next commit
-   init          create a new repository in the given directory
-   log           show revision history of entire repository or files
-   merge         merge another revision into working directory
-   pull          pull changes from the specified source
-   push          push changes to the specified destination
-   remove        remove the specified files on the next commit
-   serve         start stand-alone webserver
-   status        show changed files in the working directory
-   summary       summarize working directory state
-   update        update working directory (or switch revisions)
-  
-  (use 'hg help' for the full list of commands or 'hg -v' for details)
+  (use 'hg help' for a list of commands)
   [255]
 Enabling commands selectively, only fold enabled, next is still unknown
   $ cat >> $HGRCPATH <<EOF
@@ -1224,30 +1180,7 @@
   [255]
   $ hg next
   hg: unknown command 'next'
-  Mercurial Distributed SCM
-  
-  basic commands:
-  
-   add           add the specified files on the next commit
-   annotate      show changeset information by line for each file
-   clone         make a copy of an existing repository
-   commit        commit the specified files or all outstanding changes
-   diff          diff repository (or selected files)
-   export        dump the header and diffs for one or more changesets
-   fold          fold multiple revisions into a single one
-   forget        forget the specified files on the next commit
-   init          create a new repository in the given directory
-   log           show revision history of entire repository or files
-   merge         merge another revision into working directory
-   pull          pull changes from the specified source
-   push          push changes to the specified destination
-   remove        remove the specified files on the next commit
-   serve         start stand-alone webserver
-   status        show changed files in the working directory
-   summary       summarize working directory state
-   update        update working directory (or switch revisions)
-  
-  (use 'hg help' for the full list of commands or 'hg -v' for details)
+  (use 'hg help' for a list of commands)
   [255]
 
 Shows "use 'hg evolve' to..." hints iff the evolve command is enabled
--- a/tests/test-exchange-obsmarkers-case-A1.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-A1.t	Wed Oct 17 13:44:06 2018 +0200
@@ -113,7 +113,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
-  new changesets f5bc6836db60
+  new changesets f5bc6836db60 (1 drafts)
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -155,7 +155,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
-  new changesets f5bc6836db60
+  new changesets f5bc6836db60 (1 drafts)
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -269,7 +269,7 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files
   1 new obsolescence markers
-  new changesets f5bc6836db60:f6fbb35d8ac9
+  new changesets f5bc6836db60:f6fbb35d8ac9 (2 drafts)
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -311,7 +311,7 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files
   1 new obsolescence markers
-  new changesets f5bc6836db60:f6fbb35d8ac9
+  new changesets f5bc6836db60:f6fbb35d8ac9 (2 drafts)
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-obsmarkers-case-A2.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-A2.t	Wed Oct 17 13:44:06 2018 +0200
@@ -124,7 +124,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
-  new changesets f5bc6836db60
+  new changesets f5bc6836db60 (1 drafts)
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-obsmarkers-case-A3.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-A3.t	Wed Oct 17 13:44:06 2018 +0200
@@ -146,7 +146,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
-  new changesets e5ea8f9c7314
+  new changesets e5ea8f9c7314 (1 drafts)
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -268,7 +268,7 @@
   1 new obsolescence markers
   obsoleted 1 changesets
   1 new orphan changesets
-  new changesets e5ea8f9c7314
+  new changesets e5ea8f9c7314 (1 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-obsmarkers-case-A4.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-A4.t	Wed Oct 17 13:44:06 2018 +0200
@@ -134,7 +134,7 @@
   adding file changes
   added 2 changesets with 2 changes to 2 files
   1 new obsolescence markers
-  new changesets 28b51eb45704:06055a7959d4
+  new changesets 28b51eb45704:06055a7959d4 (2 drafts)
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-obsmarkers-case-A5.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-A5.t	Wed Oct 17 13:44:06 2018 +0200
@@ -141,7 +141,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
-  new changesets f6298a8ac3a4
+  new changesets f6298a8ac3a4 (1 drafts)
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-obsmarkers-case-B3.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-B3.t	Wed Oct 17 13:44:06 2018 +0200
@@ -120,7 +120,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets f5bc6836db60
+  new changesets f5bc6836db60 (1 drafts)
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-obsmarkers-case-B5.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-B5.t	Wed Oct 17 13:44:06 2018 +0200
@@ -158,7 +158,7 @@
   adding file changes
   added 3 changesets with 3 changes to 3 files
   1 new obsolescence markers
-  new changesets 28b51eb45704:1d0f3cd25300
+  new changesets 28b51eb45704:1d0f3cd25300 (3 drafts)
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-obsmarkers-case-C2.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-C2.t	Wed Oct 17 13:44:06 2018 +0200
@@ -131,7 +131,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   2 new obsolescence markers
-  new changesets e5ea8f9c7314
+  new changesets e5ea8f9c7314 (1 drafts)
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -179,7 +179,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   2 new obsolescence markers
-  new changesets e5ea8f9c7314
+  new changesets e5ea8f9c7314 (1 drafts)
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-obsmarkers-case-D1.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-D1.t	Wed Oct 17 13:44:06 2018 +0200
@@ -128,7 +128,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   2 new obsolescence markers
-  new changesets e5ea8f9c7314
+  new changesets e5ea8f9c7314 (1 drafts)
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
@@ -176,7 +176,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   2 new obsolescence markers
-  new changesets e5ea8f9c7314
+  new changesets e5ea8f9c7314 (1 drafts)
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-exchange-obsmarkers-case-D4.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-exchange-obsmarkers-case-D4.t	Wed Oct 17 13:44:06 2018 +0200
@@ -141,7 +141,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   2 new obsolescence markers
-  new changesets e5ea8f9c7314
+  new changesets e5ea8f9c7314 (1 drafts)
   (run 'hg update' to get a working copy)
   ## post pull state
   # obstore: main
--- a/tests/test-obsolete.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-obsolete.t	Wed Oct 17 13:44:06 2018 +0200
@@ -194,7 +194,7 @@
   checking manifests
   crosschecking files in changesets and manifests
   checking files
-  5 files, 5 changesets, 5 total revisions
+  checked 5 changesets with 5 changes to 5 files
   $ qlog -R ../other-new -r 'obsolete()'
   2
   - 0d3f46688ccc
@@ -284,7 +284,7 @@
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   1 new obsolescence markers
   obsoleted 1 changesets
-  new changesets 909a0fb57e5d
+  new changesets 909a0fb57e5d (1 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ qlog -R ../other-new
   6
@@ -377,7 +377,7 @@
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   1 new obsolescence markers
   obsoleted 1 changesets
-  new changesets 159dfc9fa5d3
+  new changesets 159dfc9fa5d3 (1 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
   $ hg up -q 7 # to check rollback update behavior
--- a/tests/test-options.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-options.t	Wed Oct 17 13:44:06 2018 +0200
@@ -26,5 +26,4 @@
   > EOF
   $ hg prune | head -n 2
   hg: unknown command 'prune'
-  Mercurial Distributed SCM
-  
+  (use 'hg help' for a list of commands)
--- a/tests/test-prev-next.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-prev-next.t	Wed Oct 17 13:44:06 2018 +0200
@@ -460,7 +460,8 @@
 
 XXX: things are broken!
   $ hg prev --merge --config commands.update.check=abort
-  local [working copy] changed bar which other [destination] deleted
+  file 'bar' was deleted in other [destination] but was modified in local [working copy].
+  What do you want to do?
   use (c)hanged version, (d)elete, or leave (u)nresolved? 
   0 files updated, 0 files merged, 0 files removed, 1 files unresolved
   use 'hg resolve' to retry unresolved file merges
--- a/tests/test-push-checkheads-partial-C1.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-push-checkheads-partial-C1.t	Wed Oct 17 13:44:06 2018 +0200
@@ -51,7 +51,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets d73caddc5533
+  new changesets d73caddc5533 (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-partial-C2.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-push-checkheads-partial-C2.t	Wed Oct 17 13:44:06 2018 +0200
@@ -53,7 +53,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets d73caddc5533
+  new changesets d73caddc5533 (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-partial-C3.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-push-checkheads-partial-C3.t	Wed Oct 17 13:44:06 2018 +0200
@@ -53,7 +53,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets d73caddc5533
+  new changesets d73caddc5533 (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-partial-C4.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-push-checkheads-partial-C4.t	Wed Oct 17 13:44:06 2018 +0200
@@ -53,7 +53,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets d73caddc5533
+  new changesets d73caddc5533 (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B2.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-push-checkheads-pruned-B2.t	Wed Oct 17 13:44:06 2018 +0200
@@ -53,7 +53,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets d73caddc5533
+  new changesets d73caddc5533 (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B3.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-push-checkheads-pruned-B3.t	Wed Oct 17 13:44:06 2018 +0200
@@ -53,7 +53,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets d73caddc5533
+  new changesets d73caddc5533 (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B4.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-push-checkheads-pruned-B4.t	Wed Oct 17 13:44:06 2018 +0200
@@ -54,7 +54,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets d73caddc5533
+  new changesets d73caddc5533 (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B5.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-push-checkheads-pruned-B5.t	Wed Oct 17 13:44:06 2018 +0200
@@ -57,7 +57,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  new changesets d73caddc5533:821fb21d0dd2
+  new changesets d73caddc5533:821fb21d0dd2 (2 drafts)
   (run 'hg update' to get a working copy)
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-pruned-B8.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-push-checkheads-pruned-B8.t	Wed Oct 17 13:44:06 2018 +0200
@@ -55,7 +55,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets d73caddc5533
+  new changesets d73caddc5533 (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-superceed-A2.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-push-checkheads-superceed-A2.t	Wed Oct 17 13:44:06 2018 +0200
@@ -52,7 +52,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets d73caddc5533
+  new changesets d73caddc5533 (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-superceed-A3.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-push-checkheads-superceed-A3.t	Wed Oct 17 13:44:06 2018 +0200
@@ -55,7 +55,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets d73caddc5533
+  new changesets d73caddc5533 (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-superceed-A6.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-push-checkheads-superceed-A6.t	Wed Oct 17 13:44:06 2018 +0200
@@ -59,7 +59,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files (+1 heads)
-  new changesets d73caddc5533:0f88766e02d6
+  new changesets d73caddc5533:0f88766e02d6 (2 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-superceed-A7.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-push-checkheads-superceed-A7.t	Wed Oct 17 13:44:06 2018 +0200
@@ -59,7 +59,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files (+1 heads)
-  new changesets d73caddc5533:0f88766e02d6
+  new changesets d73caddc5533:0f88766e02d6 (2 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg up 'desc(C0)'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-unpushed-D2.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-push-checkheads-unpushed-D2.t	Wed Oct 17 13:44:06 2018 +0200
@@ -57,7 +57,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets d73caddc5533
+  new changesets d73caddc5533 (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-unpushed-D3.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-push-checkheads-unpushed-D3.t	Wed Oct 17 13:44:06 2018 +0200
@@ -56,7 +56,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets d73caddc5533
+  new changesets d73caddc5533 (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-unpushed-D4.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-push-checkheads-unpushed-D4.t	Wed Oct 17 13:44:06 2018 +0200
@@ -73,7 +73,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files (+1 heads)
-  new changesets d73caddc5533:0f88766e02d6
+  new changesets d73caddc5533:0f88766e02d6 (2 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg up 0
   0 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-push-checkheads-unpushed-D5.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-push-checkheads-unpushed-D5.t	Wed Oct 17 13:44:06 2018 +0200
@@ -62,7 +62,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files (+1 heads)
-  new changesets d73caddc5533:0f88766e02d6
+  new changesets d73caddc5533:0f88766e02d6 (2 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
   $ hg up 'desc(C0)'
   1 files updated, 0 files merged, 1 files removed, 0 files unresolved
--- a/tests/test-sharing.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-sharing.t	Wed Oct 17 13:44:06 2018 +0200
@@ -88,7 +88,7 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
   obsoleted 1 changesets
-  new changesets 60ffde5765c5
+  new changesets 60ffde5765c5 (1 drafts)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   updated to "60ffde5765c5: fix bug 37"
   1 other heads for branch "default"
@@ -457,7 +457,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets 2fe6c4bd32d0
+  new changesets 2fe6c4bd32d0 (1 drafts)
   1 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ echo 'better fix (alice)' >> file1
   $ hg amend -u alice -m 'fix bug 24 (v2 by alice)'
@@ -486,7 +486,7 @@
   added 1 changesets with 1 changes to 1 files (+1 heads)
   1 new obsolescence markers
   2 new content-divergent changesets
-  new changesets e3f99ce9d9cd
+  new changesets e3f99ce9d9cd (1 drafts)
   (run 'hg heads' to see heads, 'hg merge' to merge)
 
 Figure SG09: multiple heads! divergence! oh my!
--- a/tests/test-topic-dest.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-topic-dest.t	Wed Oct 17 13:44:06 2018 +0200
@@ -276,7 +276,7 @@
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 3 files
-  new changesets 13ec05df14e1:6482f08916a5
+  new changesets 13ec05df14e1:6482f08916a5 (3 drafts)
   updating to branch default
   3 files updated, 0 files merged, 0 files removed, 0 files unresolved
   $ cd other
@@ -290,7 +290,7 @@
   adding manifests
   adding file changes
   added 3 changesets with 3 changes to 3 files (+1 heads)
-  new changesets 6f5edd7450bb:c9c03b99196b
+  new changesets 6f5edd7450bb:c9c03b99196b (3 drafts)
   rebasing 3:dbc48dd9e743 "c_other"
   $ hg log -G
   @  7 () c_other
--- a/tests/test-topic-tutorial.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-topic-tutorial.t	Wed Oct 17 13:44:06 2018 +0200
@@ -1845,7 +1845,7 @@
   adding file changes
   added 4 changesets with 4 changes to 1 files (+1 heads)
   8 new obsolescence markers
-  new changesets b7509bd417f8:2d084ac00115
+  new changesets b7509bd417f8:2d084ac00115 (4 drafts)
   (run 'hg heads' to see heads)
 
   $ hg topics --verbose
@@ -1889,7 +1889,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets 0d409663a1fd
+  new changesets 0d409663a1fd (1 drafts)
   (run 'hg update' to get a working copy)
 
   $ hg update
--- a/tests/test-topic.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-topic.t	Wed Oct 17 13:44:06 2018 +0200
@@ -164,11 +164,12 @@
   
   options ([+] can be repeated):
   
-      --clear       clear active topic if any
-   -r --rev REV [+] revset of existing revisions
-   -l --list        show the stack of changeset in the topic
-      --age         show when you last touched the topics
-      --current     display the current topic only
+      --clear             clear active topic if any
+   -r --rev REV [+]       revset of existing revisions
+   -l --list              show the stack of changeset in the topic
+      --age               show when you last touched the topics
+      --current           display the current topic only
+   -T --template TEMPLATE display with template
   
   (some details hidden, use --verbose to show complete help)
   $ hg topics
@@ -614,7 +615,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files (+1 heads)
-  new changesets 0469d521db49
+  new changesets 0469d521db49 (1 drafts)
   (run 'hg heads' to see heads)
   $ hg topics
      fran  (1 changesets)
--- a/tests/test-tutorial.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-tutorial.t	Wed Oct 17 13:44:06 2018 +0200
@@ -1070,7 +1070,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new obsolescence markers
-  new changesets 4710c0968793
+  new changesets 4710c0968793 (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  4710c0968793 (draft): bathroom stuff
@@ -1212,7 +1212,7 @@
   adding file changes
   added 1 changesets with 1 changes to 1 files
   1 new orphan changesets
-  new changesets e4e4fa805d92
+  new changesets e4e4fa805d92 (1 drafts)
   (run 'hg update' to get a working copy)
 
 The new changeset "animal" is based on an old changeset of "bathroom". You can
@@ -1543,7 +1543,7 @@
   adding manifests
   adding file changes
   added 1 changesets with 1 changes to 1 files
-  new changesets fc41faf45288
+  new changesets fc41faf45288 (1 drafts)
   (run 'hg update' to get a working copy)
   $ hg log -G
   o  fc41faf45288 (draft): SPAM SPAM SPAM
--- a/tests/test-wireproto-bundle1.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-wireproto-bundle1.t	Wed Oct 17 13:44:06 2018 +0200
@@ -50,7 +50,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  new changesets 8685c6d34325:4957bfdac07e
+  new changesets 8685c6d34325:4957bfdac07e (2 drafts)
   (run 'hg update' to get a working copy)
   $ hg push -R ../other
   pushing to ssh://user@dummy/server
@@ -90,7 +90,7 @@
   added 1 changesets with 1 changes to [12] files \(\+1 heads\) (re)
   1 new obsolescence markers
   obsoleted 1 changesets
-  new changesets 9d1c114e7797
+  new changesets 9d1c114e7797 (1 drafts)
   (run 'hg heads' to see heads)
   $ hg -R ../other pull
   pulling from ssh://user@dummy/server
--- a/tests/test-wireproto.t	Fri Oct 12 15:07:23 2018 +0200
+++ b/tests/test-wireproto.t	Wed Oct 17 13:44:06 2018 +0200
@@ -53,7 +53,7 @@
   adding manifests
   adding file changes
   added 2 changesets with 2 changes to 2 files
-  new changesets 8685c6d34325:4957bfdac07e
+  new changesets 8685c6d34325:4957bfdac07e (2 drafts)
   (run 'hg update' to get a working copy)
   $ hg push -R ../other
   pushing to ssh://user@dummy/server
@@ -95,7 +95,7 @@
   obsmarker-exchange: 92 bytes received
   1 new obsolescence markers
   obsoleted 1 changesets
-  new changesets 9d1c114e7797
+  new changesets 9d1c114e7797 (1 drafts)
   (run 'hg heads' to see heads)
   $ hg -R ../other pull
   pulling from ssh://user@dummy/server
@@ -128,7 +128,7 @@
   added 1 changesets with 1 changes to 1 files
   obsmarker-exchange: 92 bytes received
   1 new obsolescence markers
-  new changesets a5687ec59dd4
+  new changesets a5687ec59dd4 (1 drafts)
   (run 'hg update' to get a working copy)
 
 some common hidden
@@ -195,7 +195,7 @@
   $ cat hg.pid >> $DAEMON_PIDS
 
   $ curl -s http://localhost:$HGPORT/?cmd=capabilities
-  _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache changegroupsubset compression=*zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) (glob)
+  _evoext_getbundle_obscommon _evoext_obshashrange_v1 batch branchmap bundle2=HG20%0Abookmarks%0Achangegroup%3D01%2C02%0Adigests%3Dmd5%2Csha1%2Csha512%0Aerror%3Dabort%2Cunsupportedcontent%2Cpushraced%2Cpushkey%0Ahgtagsfnodes%0Alistkeys%0Aobsmarkers%3DV0%2CV1%0Aphases%3Dheads%0Apushkey%0Aremote-changegroup%3Dhttp%2Chttps%0Arev-branch-cache%0Astream%3Dv2 changegroupsubset compression=*zlib getbundle httpheader=1024 httpmediatype=0.1rx,0.1tx,0.2tx known lookup pushkey streamreqs=generaldelta,revlogv1 unbundle=HG10GZ,HG10BZ,HG10UN unbundlehash (no-eol) (glob)
 
 Check we cannot use pushkey for marker exchange anymore