1237 ui.warn(_('Multiple non-obsolete children, explicitly update to one\n')) |
1237 ui.warn(_('Multiple non-obsolete children, explicitly update to one\n')) |
1238 return 1 |
1238 return 1 |
1239 |
1239 |
1240 @command('^prune|obsolete|kill', |
1240 @command('^prune|obsolete|kill', |
1241 [('n', 'new', [], _("successor changeset")), |
1241 [('n', 'new', [], _("successor changeset")), |
1242 ('r', 'rev', [], _("revisions to fold"))], |
1242 ('r', 'rev', [], _("revisions to prune"))], |
1243 _('[OPTION] [-r] REV...')) |
1243 _('[OPTION] [-r] REV...')) |
1244 def kill(ui, repo, *revs, **opts): |
1244 def kill(ui, repo, *revs, **opts): |
1245 """mark a changeset as obsolete |
1245 """mark a changeset as obsolete |
1246 |
1246 |
1247 This update the parent directory to a not-killed parent if the current |
1247 This update the parent directory to a not-killed parent if the current |