[PATCH 3 of 3 evolve-ext] evolve: undo change from "divergent" to "phasedivergent" for --divergent

Martin von Zweigbergk martinvonz at google.com
Thu Aug 24 18:02:49 UTC 2017


# HG changeset patch
# User Martin von Zweigbergk <martinvonz at google.com>
# Date 1503597613 25200
#      Thu Aug 24 11:00:13 2017 -0700
# Node ID 459f72224b05858b91595dcb74e269589ae0529e
# Parent  bffdf2aafc3ddceabc5645eaef909abfda01c018
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).

diff --git a/hgext3rd/evolve/__init__.py b/hgext3rd/evolve/__init__.py
--- a/hgext3rd/evolve/__init__.py
+++ b/hgext3rd/evolve/__init__.py
@@ -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)')),



More information about the Mercurial-devel mailing list