1339 _('ask for confirmation before performing the action')), |
1339 _('ask for confirmation before performing the action')), |
1340 ('A', 'any', False, |
1340 ('A', 'any', False, |
1341 _('also consider troubled changesets unrelated to current working ' |
1341 _('also consider troubled changesets unrelated to current working ' |
1342 'directory')), |
1342 'directory')), |
1343 ('r', 'rev', [], _('solves troubles of these revisions')), |
1343 ('r', 'rev', [], _('solves troubles of these revisions')), |
1344 ('', 'bumped', False, _('solves only bumped changesets')), |
1344 ('', 'bumped', False, _('solves only bumped changesets (DEPRECATED)')), |
1345 ('', 'phase-divergent', False, _('solves only phase-divergent changesets')), |
1345 ('', 'phase-divergent', False, _('solves only phase-divergent changesets')), |
1346 ('', 'divergent', False, _('solves only divergent changesets')), |
1346 ('', 'divergent', False, _('solves only divergent changesets (DEPRECATED)')), |
1347 ('', 'content-divergent', False, _('solves only content-divergent changesets')), |
1347 ('', 'content-divergent', False, _('solves only content-divergent changesets')), |
1348 ('', 'unstable', False, _('solves only unstable changesets')), |
1348 ('', 'unstable', False, _('solves only unstable changesets (DEPRECATED)')), |
1349 ('', 'orphan', False, _('solves only orphan changesets (default)')), |
1349 ('', 'orphan', False, _('solves only orphan changesets (default)')), |
1350 ('a', 'all', False, _('evolve all troubled changesets related to the ' |
1350 ('a', 'all', False, _('evolve all troubled changesets related to the ' |
1351 'current working directory and its descendants')), |
1351 'current working directory and its descendants')), |
1352 ('', 'update', True, _('update to the head of evolved changesets')), |
1352 ('', 'update', True, _('update to the head of evolved changesets')), |
1353 ('c', 'continue', False, _('continue an interrupted evolution')), |
1353 ('c', 'continue', False, _('continue an interrupted evolution')), |