Mercurial > evolve
changeset 4168:8eec9422bd8e stable
test: other harmless output change
These are new test that need adjustment for 4.7 output.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Fri, 12 Oct 2018 15:07:23 +0200 |
parents | 7091f7215651 |
children | 39b144f9fa54 ab3581bc0637 |
files | tests/test-evolve.t tests/test-options.t tests/test-prev-next.t |
diffstat | 3 files changed, 73 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-evolve.t Fri Oct 12 14:56:00 2018 +0200 +++ b/tests/test-evolve.t Fri Oct 12 15:07:23 2018 +0200 @@ -1163,11 +1163,55 @@ > EOF $ hg next hg: unknown command 'next' - (use 'hg help' for a list of commands) + 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) [255] $ hg fold hg: unknown command 'fold' - (use 'hg help' for a list of commands) + 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) [255] Enabling commands selectively, only fold enabled, next is still unknown $ cat >> $HGRCPATH <<EOF @@ -1180,7 +1224,30 @@ [255] $ hg next hg: unknown command 'next' - (use 'hg help' for a list of commands) + 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) [255] Shows "use 'hg evolve' to..." hints iff the evolve command is enabled
--- a/tests/test-options.t Fri Oct 12 14:56:00 2018 +0200 +++ b/tests/test-options.t Fri Oct 12 15:07:23 2018 +0200 @@ -26,4 +26,5 @@ > EOF $ hg prune | head -n 2 hg: unknown command 'prune' - (use 'hg help' for a list of commands) + Mercurial Distributed SCM +
--- a/tests/test-prev-next.t Fri Oct 12 14:56:00 2018 +0200 +++ b/tests/test-prev-next.t Fri Oct 12 15:07:23 2018 +0200 @@ -460,8 +460,7 @@ XXX: things are broken! $ hg prev --merge --config commands.update.check=abort - file 'bar' was deleted in other [destination] but was modified in local [working copy]. - What do you want to do? + local [working copy] changed bar which other [destination] deleted 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