##// END OF EJS Templates
convert: fix crazy rollback call, broken by recent rollback safety checks...
Matt Mackall -
r15193:a84e3ed6 default
parent child Browse files
Show More
@@ -178,7 +178,7 class mercurial_sink(converter_sink):
178 closed = 'close' in commit.extra
178 closed = 'close' in commit.extra
179 if not closed and not man.cmp(m1node, man.revision(mnode)):
179 if not closed and not man.cmp(m1node, man.revision(mnode)):
180 self.ui.status(_("filtering out empty revision\n"))
180 self.ui.status(_("filtering out empty revision\n"))
181 self.repo.rollback()
181 self.repo.rollback(force=True)
182 return parent
182 return parent
183 return p2
183 return p2
184
184
General Comments 0
You need to be logged in to leave comments. Login now