# HG changeset patch # User Matt Mackall # Date 1318019795 18000 # Node ID a84e3ed661cbde43ba225eb239e552e2061c507d # Parent 3834ca04664a7063dc3c24bcc478a4146bc2e35a convert: fix crazy rollback call, broken by recent rollback safety checks This was causing test-convert-cvs.t to fail. diff -r 3834ca04664a -r a84e3ed661cb hgext/convert/hg.py --- a/hgext/convert/hg.py Sun Oct 02 13:13:46 2011 -0500 +++ b/hgext/convert/hg.py Fri Oct 07 15:36:35 2011 -0500 @@ -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