# HG changeset patch # User kevpeng@google.com # Date 1560563083 25200 # Node ID d0965c5c5335d14ea0bcb4e0bf336f43ba4fe381 # Parent ef8907df73fce51c6e4ddc85365139e84ca7b697 evolve: further clarify when update is performed diff -r ef8907df73fc -r d0965c5c5335 hgext3rd/evolve/evolvecmd.py --- 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