Mercurial > evolve
changeset 4751:d0965c5c5335 stable
evolve: further clarify when update is performed
author | kevpeng@google.com |
---|---|
date | Fri, 14 Jun 2019 18:44:43 -0700 |
parents | ef8907df73fc |
children | 184c64c81528 |
files | hgext3rd/evolve/evolvecmd.py |
diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/hgext3rd/evolve/evolvecmd.py Wed Jul 17 17:58:44 2019 +0200 +++ b/hgext3rd/evolve/evolvecmd.py Fri Jun 14 18:44:43 2019 -0700 @@ -1534,8 +1534,9 @@ If so, evolve rebases that changeset. If not, evolve refuses to guess your intention, and gives a hint about what you might want to do next. - When ``--update`` is used, successful evolve operations update the - working directory to the newly created changesets. + When ``--update`` is used, successful evolve operations update the working + directory to the newly created changesets. Moreover, an update will always + be performed if the current working directory parent is obsolete. Automatic mode only handles common use cases. For example, it avoids taking action in the case of ambiguity, and it ignores orphan changesets that are