# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2011-10-07 20:36:35
# 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 --git a/hgext/convert/hg.py b/hgext/convert/hg.py
--- a/hgext/convert/hg.py
+++ b/hgext/convert/hg.py
@@ -178,7 +178,7 @@ class mercurial_sink(converter_sink):
             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