D5022: absorb: update help text

mbthomas (Mark Thomas) phabricator at mercurial-scm.org
Fri Oct 12 20:04:40 UTC 2018


mbthomas created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.

REVISION SUMMARY
  Update the help text to reflect the recent changes to absorb in https://phab.mercurial-scm.org/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.

REPOSITORY
  rHG Mercurial

BRANCH
  default

REVISION DETAIL
  https://phab.mercurial-scm.org/D5022

AFFECTED FILES
  hgext/absorb.py

CHANGE DETAILS

diff --git a/hgext/absorb.py b/hgext/absorb.py
--- a/hgext/absorb.py
+++ b/hgext/absorb.py
@@ -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.
     """



To: mbthomas, #hg-reviewers
Cc: mercurial-devel


More information about the Mercurial-devel mailing list