Mercurial > hg
comparison 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 |
comparison
equal
deleted
inserted
replaced
11672:dad185761392 | 11673:a2f11188e2d2 |
---|---|
173 p2 = hex(self.repo.changelog.tip()) | 173 p2 = hex(self.repo.changelog.tip()) |
174 | 174 |
175 if self.filemapmode and nparents == 1: | 175 if self.filemapmode and nparents == 1: |
176 man = self.repo.manifest | 176 man = self.repo.manifest |
177 mnode = self.repo.changelog.read(bin(p2))[0] | 177 mnode = self.repo.changelog.read(bin(p2))[0] |
178 if not man.cmp(m1node, man.revision(mnode)): | 178 closed = 'close' in commit.extra |
179 if not closed and not man.cmp(m1node, man.revision(mnode)): | |
179 self.ui.status(_("filtering out empty revision\n")) | 180 self.ui.status(_("filtering out empty revision\n")) |
180 self.repo.rollback() | 181 self.repo.rollback() |
181 return parent | 182 return parent |
182 return p2 | 183 return p2 |
183 | 184 |