Mercurial > evolve
changeset 4087:7b129ce23fad
branching: merge back with stable
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Mon, 03 Sep 2018 23:30:28 +0200 |
| parents | 73f22dc3bbbe (diff) 8a357f05187d (current diff) |
| children | 6f391c2a773b |
| files | hgext3rd/evolve/metadata.py hgext3rd/topic/__init__.py |
| diffstat | 5 files changed, 8 insertions(+), 75 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/metadata.py Mon Sep 03 23:29:15 2018 +0200 +++ b/hgext3rd/evolve/metadata.py Mon Sep 03 23:30:28 2018 +0200 @@ -5,7 +5,7 @@ # This software may be used and distributed according to the terms of the # GNU General Public License version 2 or any later version. -__version__ = '8.2.1.dev' +__version__ = '8.3.0.dev' testedwith = '4.3.2 4.4.2 4.5.2 4.6.2 4.7' minimumhgversion = '4.3' buglink = 'https://bz.mercurial-scm.org/'
--- a/hgext3rd/topic/__init__.py Mon Sep 03 23:29:15 2018 +0200 +++ b/hgext3rd/topic/__init__.py Mon Sep 03 23:30:28 2018 +0200 @@ -178,7 +178,7 @@ 'topic.active': 'green', } -__version__ = '0.11.1.dev' +__version__ = '0.12.0.dev' testedwith = '4.3.3 4.4.2 4.5.2 4.6.2 4.7' minimumhgversion = '4.3'
--- a/tests/test-evolve.t Mon Sep 03 23:29:15 2018 +0200 +++ b/tests/test-evolve.t Mon Sep 03 23:30:28 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 @@ -1225,30 +1181,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-options.t Mon Sep 03 23:29:15 2018 +0200 +++ b/tests/test-options.t Mon Sep 03 23:30:28 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 Mon Sep 03 23:29:15 2018 +0200 +++ b/tests/test-prev-next.t Mon Sep 03 23:30:28 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