--- a/hgext3rd/evolve/evolvecmd.py Wed Oct 17 13:36:08 2018 +0200
+++ b/hgext3rd/evolve/evolvecmd.py Sun Oct 14 13:35:13 2018 +0200
@@ -1341,11 +1341,11 @@
_('also consider troubled changesets unrelated to current working '
'directory')),
('r', 'rev', [], _('solves troubles of these revisions')),
- ('', 'bumped', False, _('solves only bumped changesets')),
+ ('', 'bumped', False, _('solves only bumped changesets (DEPRECATED)')),
('', 'phase-divergent', False, _('solves only phase-divergent changesets')),
- ('', 'divergent', False, _('solves only divergent changesets')),
+ ('', 'divergent', False, _('solves only divergent changesets (DEPRECATED)')),
('', 'content-divergent', False, _('solves only content-divergent changesets')),
- ('', 'unstable', False, _('solves only unstable changesets')),
+ ('', 'unstable', False, _('solves only unstable changesets (DEPRECATED)')),
('', 'orphan', False, _('solves only orphan changesets (default)')),
('a', 'all', False, _('evolve all troubled changesets related to the '
'current working directory and its descendants')),