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.
evolve: undo change from "divergent" to "phasedivergent" for --divergent
authorMartin von Zweigbergk <martinvonz@google.com>
Thu, 24 Aug 2017 11:00:13 -0700
changeset 2859 2a228fb6c23e
parent 2858 4b934144ed11
child 2860 27ae7afd9a2a
evolve: undo change from "divergent" to "phasedivergent" for --divergent Looks like an accidental update in feaa52680682 (log: bumped was renamed into phasedivergent, 2017-08-10).
hgext3rd/evolve/__init__.py file | annotate | diff | comparison | revisions 
--- a/hgext3rd/evolve/__init__.py	Thu Aug 24 10:57:32 2017 -0700
+++ b/hgext3rd/evolve/__init__.py	Thu Aug 24 11:00:13 2017 -0700
@@ -1384,7 +1384,7 @@
      ('r', 'rev', [], _('solves troubles of these revisions')),
      ('', 'bumped', False, _('solves only bumped changesets')),
      ('', 'phasedivergent', False, _('solves only phase-divergent changesets')),
-     ('', 'divergent', False, _('solves only phasedivergent changesets')),
+     ('', 'divergent', False, _('solves only divergent changesets')),
      ('', 'contentdivergent', False, _('solves only content-divergent changesets')),
      ('', 'unstable', False, _('solves only unstable changesets')),
      ('', 'orphan', False, _('solves only orphan changesets (default)')),
evolve