# HG changeset patch # User Pierre-Yves David # Date 1536009699 -7200 # Node ID 73f22dc3bbbe590e522ad9f649960fd5d042225e # Parent c53bf38e2e5a1461ab672fbe89317ae3d4ad12dd# Parent 13d8a2d559bdf4e032c2dc09ac44294eb1aee202 branching: merge back with stable diff -r 13d8a2d559bd -r 73f22dc3bbbe tests/test-evolve.t --- a/tests/test-evolve.t Mon Sep 03 17:21:16 2018 +0200 +++ b/tests/test-evolve.t Mon Sep 03 23:21:39 2018 +0200 @@ -1164,55 +1164,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 $ hg prune | head -n 2 hg: unknown command 'prune' - Mercurial Distributed SCM - + (use 'hg help' for a list of commands) diff -r 13d8a2d559bd -r 73f22dc3bbbe tests/test-prev-next.t --- a/tests/test-prev-next.t Mon Sep 03 17:21:16 2018 +0200 +++ b/tests/test-prev-next.t Mon Sep 03 23:21:39 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