hgext3rd/evolve/cmdrewrite.py
changeset 4774 12a88b988875
parent 4759 f30c1fab7155
parent 4765 c1d0faaa5b92
child 4795 6c02b9ac2832
child 4832 8a491546e81d
--- a/hgext3rd/evolve/cmdrewrite.py	Wed Jul 17 12:47:37 2019 -0700
+++ b/hgext3rd/evolve/cmdrewrite.py	Mon Jul 29 13:54:57 2019 +0200
@@ -965,7 +965,7 @@
 @eh.command(
     b'prune|obsolete',
     [(b'n', b'new', [], _(b"successor changeset (DEPRECATED)")),
-     (b's', b'succ', [], _(b"successor changeset"), _(b'REV')),
+     (b's', b'successor', [], _(b"successor changeset"), _(b'REV')),
      (b'r', b'rev', [], _(b"revisions to prune"), _(b'REV')),
      (b'k', b'keep', None, _(b"does not modify working copy during prune")),
      (b'n', b'note', b'', _(b'store a note on prune'), _(b'TEXT')),
@@ -973,9 +973,9 @@
                              b"(pairing multiple precursors to multiple successors)")),
      (b'', b'biject', False, _(b"alias to --pair (DEPRECATED)")),
      (b'', b'fold', False,
-      _(b"record a fold (multiple precursors, one successors)")),
+      _(b"record a fold (multiple precursors, one successor)")),
      (b'', b'split', False,
-      _(b"record a split (on precursor, multiple successors)")),
+      _(b"record a split (one precursor, multiple successors)")),
      (b'B', b'bookmark', [], _(b"remove revs only reachable from given"
                                b" bookmark"), _(b'BOOKMARK'))] + metadataopts,
     _(b'[OPTION] [-r] REV...'),
@@ -992,23 +992,23 @@
     When you prune the parent of your working copy, Mercurial updates the working
     copy to a non-obsolete parent.
 
-    You can use ``-s/--succ`` to tell Mercurial that a newer version (successor) of the
-    pruned changeset exists. Mercurial records successor revisions in obsolescence
-    markers.
+    You can use ``-s/--successor`` to tell Mercurial that a newer version
+    (successor) of the pruned changeset exists. Mercurial records successor
+    revisions in obsolescence markers.
 
     If you prune a single revision and specify multiple revisions in
-    ``-s/--succ``, you are recording a "split" and must acknowledge it by
+    ``-s/--successor``, you are recording a "split" and must acknowledge it by
     passing ``--split``. Similarly, when you prune multiple changesets with a
     single successor, you must pass the ``--fold`` option.
 
-    If you want to supersede multiple revisions at the same time, use
+    If you want to supersede multiple revisions at the same time, use the
     ``--pair`` option to pair the pruned precursor and successor changesets.
     This is commonly useful for resolving history divergence, or when someone
-    else does edits history without obsolescence enabled.
+    else edits history without obsolescence enabled.
     """
     _checknotesize(ui, opts)
     revs = scmutil.revrange(repo, list(revs) + opts.get('rev'))
-    succs = opts['new'] + opts['succ']
+    succs = opts['new'] + opts['successor']
     bookmarks = set(opts.get('bookmark'))
     metadata = _getmetadata(**opts)
     biject = opts.get('pair') or opts.get('biject')