Mercurial Mercurial > pub > hg > evolve / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test-compat: merge stable into mercurial-5.0 mercurial-5.0
authorPierre-Yves David <pierre-yves.david@octobus.net>
Mon, 29 Jul 2019 11:40:14 +0200
branchmercurial-5.0
changeset 4768 9ae3a1d71d4b
parent 4767 7e0bc48c9f49 (current diff)
parent 4765 c1d0faaa5b92 (diff)
child 4769 3c71137f30d4
child 4779 85a97f37c78f
test-compat: merge stable into mercurial-5.0
--- a/hgext3rd/evolve/cmdrewrite.py	Thu Jul 25 18:29:59 2019 +0200
+++ b/hgext3rd/evolve/cmdrewrite.py	Mon Jul 29 11:40:14 2019 +0200
@@ -966,9 +966,9 @@
                            "(pairing multiple precursors to multiple successors)")),
      ('', 'biject', False, _("alias to --pair (DEPRECATED)")),
      ('', 'fold', False,
-      _("record a fold (multiple precursors, one successors)")),
+      _("record a fold (multiple precursors, one successor)")),
      ('', 'split', False,
-      _("record a split (on precursor, multiple successors)")),
+      _("record a split (one precursor, multiple successors)")),
      ('B', 'bookmark', [], _("remove revs only reachable from given"
                              " bookmark"), _('BOOKMARK'))] + metadataopts,
     _('[OPTION] [-r] REV...'),
@@ -994,10 +994,10 @@
     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'))
evolve