equal
deleted
inserted
replaced
1116 '(implies any)'), |
1116 '(implies any)'), |
1117 ('c', 'continue', False, 'continue an interrupted evolution'), |
1117 ('c', 'continue', False, 'continue an interrupted evolution'), |
1118 ] + mergetoolopts, |
1118 ] + mergetoolopts, |
1119 _('[OPTIONS]...')) |
1119 _('[OPTIONS]...')) |
1120 def evolve(ui, repo, **opts): |
1120 def evolve(ui, repo, **opts): |
1121 """Solve trouble in your repository |
1121 """solve trouble in your repository |
1122 |
1122 |
1123 - rebase unstable changesets to make them stable again, |
1123 - rebase unstable changesets to make them stable again, |
1124 - create proper diffs from bumped changesets, |
1124 - create proper diffs from bumped changesets, |
1125 - merge divergent changesets, |
1125 - merge divergent changesets, |
1126 - update to a successor if the working directory parent is |
1126 - update to a successor if the working directory parent is |
2060 ('D', 'duplicate', False, |
2060 ('D', 'duplicate', False, |
2061 'do not mark the new revision as successor of the old one')], |
2061 'do not mark the new revision as successor of the old one')], |
2062 # allow to choose the seed ? |
2062 # allow to choose the seed ? |
2063 _('[-r] revs')) |
2063 _('[-r] revs')) |
2064 def touch(ui, repo, *revs, **opts): |
2064 def touch(ui, repo, *revs, **opts): |
2065 """Create successors that are identical to their predecessors except for the changeset ID |
2065 """create successors that are identical to their predecessors except for the changeset ID |
2066 |
2066 |
2067 This is used to "resurrect" changesets |
2067 This is used to "resurrect" changesets |
2068 """ |
2068 """ |
2069 duplicate = opts['duplicate'] |
2069 duplicate = opts['duplicate'] |
2070 revs = list(revs) |
2070 revs = list(revs) |