Mercurial > hg
diff hgext/convert/hg.py @ 11673:a2f11188e2d2
convert: handle closed branch heads in hg-hg conversion (issue2185)
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 25 Jul 2010 17:18:35 -0500 |
parents | 33010ff1fd6f |
children | d80b768545cb |
line wrap: on
line diff
--- a/hgext/convert/hg.py Sun Jul 25 17:10:32 2010 -0500 +++ b/hgext/convert/hg.py Sun Jul 25 17:18:35 2010 -0500 @@ -175,7 +175,8 @@ if self.filemapmode and nparents == 1: man = self.repo.manifest mnode = self.repo.changelog.read(bin(p2))[0] - if not man.cmp(m1node, man.revision(mnode)): + 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() return parent