comparison hgext/evolve.py @ 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
comparison
equal deleted inserted replaced
1418:ed9a8b1ee9bd 1419:b54524ae77c0
1480 If no argument are passed and the current working copy parent is obsolete, 1480 If no argument are passed and the current working copy parent is obsolete,
1481 :hg:`evolve` will update the working copy to the successors of this working 1481 :hg:`evolve` will update the working copy to the successors of this working
1482 copy parent. If the working copy parent is not obsolete (and still no 1482 copy parent. If the working copy parent is not obsolete (and still no
1483 argument passed) each invocation of :hg:`evolve` will evolve a single 1483 argument passed) each invocation of :hg:`evolve` will evolve a single
1484 unstable changeset, It will only select a changeset to be evolved if it 1484 unstable changeset, It will only select a changeset to be evolved if it
1485 will result in a new children for the current working copy parent. The 1485 will result in a new children for the current working copy parent or its
1486 working copy will be updated on the result (this last behavior will most 1486 descendants. The working copy will be updated on the result
1487 likely to change in the future). 1487 (this last behavior will most likely to change in the future).
1488 1488
1489 You can decide to evolve other categories of trouble using the --divergent 1489 You can decide to evolve other categories of trouble using the --divergent
1490 and --bumped flags. If no other option are specified, this will try to 1490 and --bumped flags. If no other option are specified, this will try to
1491 solve the specified troubles for the working copy parent. 1491 solve the specified troubles for the working copy parent.
1492 1492