Commits

Anonymous committed 64d4e3f

Got keep option working.

Comments (0)

Files changed (1)

hgext/collapse.py

             repair.strip(ui, repo, collapsed.node(), "strip")
         raise
 
-    ui.debug(_('stripping revision %d\n') % first)
-    repair.strip(ui, repo, repo[first].node(), "strip")
+    if not opts['keep']:
+        ui.debug(_('stripping revision %d\n') % first)
+        repair.strip(ui, repo, repo[first].node(), "strip")
 
     ui.status(_('collapse completed\n'))
 
         [
         ('r', 'rev', [], _('revisions to collapse')),
         ('', 'keep', False, _('keep original revisions')),
-        ('', 'keepbranches', False, _('keep original branches')),
         ],
         _('hg collapse -r REVS [--keep | --keepbranches]')),
 }