Mercurial > hg
diff hgext/convert/hg.py @ 15193:a84e3ed661cb
convert: fix crazy rollback call, broken by recent rollback safety checks
This was causing test-convert-cvs.t to fail.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 07 Oct 2011 15:36:35 -0500 |
parents | 650d81a313cb |
children | d75aa756149b |
line wrap: on
line diff
--- 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