# HG changeset patch # User Mark Thomas # Date 1539374609 0 # Node ID 8f192f2c4a1e04ac69dec66c48efcb96bc738533 # Parent 6b1a8c396b05b5b9cc52959d537684b15b539d64 absorb: update help text Update the help text to reflect the recent changes to absorb in D4999. The `-p` option actually only affects the `-a` option: without `-a`, the changes are printed; with `-a` the changes are only printed if `-p` is specified. Reword the help text for `-p` to reflect this. Differential Revision: https://phab.mercurial-scm.org/D5022 diff -r 6b1a8c396b05 -r 8f192f2c4a1e hgext/absorb.py --- a/hgext/absorb.py Fri Oct 12 16:45:46 2018 +0900 +++ b/hgext/absorb.py Fri Oct 12 20:03:29 2018 +0000 @@ -986,7 +986,7 @@ [('a', 'apply-changes', None, _('apply changes without prompting for confirmation')), ('p', 'print-changes', None, - _('just print which changesets are modified by which changes')), + _('always print which changesets are modified by which changes')), ('i', 'interactive', None, _('interactively select which chunks to apply (EXPERIMENTAL)')), ('e', 'edit-lines', None, @@ -1011,8 +1011,10 @@ Changesets that become empty after applying the changes will be deleted. - If in doubt, run :hg:`absorb -pn` to preview what changesets will - be amended by what changed lines, without actually changing anything. + By default, absorb will show what it plans to do and prompt for + confirmation. If you are confident that the changes will be absorbed + to the correct place, run :hg:`absorb -a` to apply the changes + immediately. Returns 0 on success, 1 if all chunks were ignored and nothing amended. """