1535 determines if there is an orphan changeset that can be rebased onto the |
1535 determines if there is an orphan changeset that can be rebased onto the |
1536 working copy parent in order to reduce instability. |
1536 working copy parent in order to reduce instability. |
1537 If so, evolve rebases that changeset. If not, evolve refuses to guess your |
1537 If so, evolve rebases that changeset. If not, evolve refuses to guess your |
1538 intention, and gives a hint about what you might want to do next. |
1538 intention, and gives a hint about what you might want to do next. |
1539 |
1539 |
1540 When ``--update`` is used, successful evolve operations update the |
1540 When ``--update`` is used, successful evolve operations update the working |
1541 working directory to the newly created changesets. |
1541 directory to the newly created changesets. Moreover, an update will always |
|
1542 be performed if the current working directory parent is obsolete. |
1542 |
1543 |
1543 Automatic mode only handles common use cases. For example, it avoids taking |
1544 Automatic mode only handles common use cases. For example, it avoids taking |
1544 action in the case of ambiguity, and it ignores orphan changesets that are |
1545 action in the case of ambiguity, and it ignores orphan changesets that are |
1545 not related to your working copy. |
1546 not related to your working copy. |
1546 It also refuses to solve phase-divergent or content-divergent changesets |
1547 It also refuses to solve phase-divergent or content-divergent changesets |