Skip to content
Snippets Groups Projects
Commit a84e3ed6 authored by Matt Mackall's avatar Matt Mackall
Browse files

convert: fix crazy rollback call, broken by recent rollback safety checks

This was causing test-convert-cvs.t to fail.
parent 3834ca04
No related branches found
No related tags found
No related merge requests found
......@@ -178,7 +178,7 @@
closed = 'close' in commit.extra
if not closed and not man.cmp(m1node, man.revision(mnode)):
self.ui.status(_("filtering out empty revision\n"))
self.repo.rollback()
self.repo.rollback(force=True)
return parent
return p2
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment