Mercurial > evolve
changeset 1419:b54524ae77c0
evolve: fix an issue in the documentation of the evolve function
hg evolve is solving troubles that will become children of the parent of the
working copy and its descendant. This last part was omitted by mistake from
the help message before.
author | Laurent Charignon <lcharignon@fb.com> |
---|---|
date | Tue, 23 Jun 2015 13:20:00 -0700 |
parents | ed9a8b1ee9bd |
children | 0b714c4ad9ff |
files | hgext/evolve.py |
diffstat | 1 files changed, 3 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext/evolve.py Mon Jun 22 12:41:32 2015 -0700 +++ b/hgext/evolve.py Tue Jun 23 13:20:00 2015 -0700 @@ -1482,9 +1482,9 @@ copy parent. If the working copy parent is not obsolete (and still no argument passed) each invocation of :hg:`evolve` will evolve a single unstable changeset, It will only select a changeset to be evolved if it - will result in a new children for the current working copy parent. The - working copy will be updated on the result (this last behavior will most - likely to change in the future). + will result in a new children for the current working copy parent or its + descendants. The working copy will be updated on the result + (this last behavior will most likely to change in the future). You can decide to evolve other categories of trouble using the --divergent and --bumped flags. If no other option are specified, this will try to