Mercurial Mercurial > mercurial / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: fix crazy rollback call, broken by recent rollback safety checks
authorMatt Mackall <mpm@selenic.com>
Fri, 07 Oct 2011 15:36:35 -0500
changeset 15193 a84e3ed661cb
parent 15192 3834ca04664a
child 15194 0705f2ac79d6
convert: fix crazy rollback call, broken by recent rollback safety checks This was causing test-convert-cvs.t to fail.
hgext/convert/hg.py file | annotate | diff | comparison | revisions 
--- 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
mercurial