Mercurial > hg
comparison hgext/convert/filemap.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 | 7fefef3ce791 |
comparison
equal
deleted
inserted
replaced
11672:dad185761392 | 11673:a2f11188e2d2 |
---|---|
296 if wp is None and parents: | 296 if wp is None and parents: |
297 wp = 0 | 297 wp = 0 |
298 | 298 |
299 self.origparents[rev] = parents | 299 self.origparents[rev] = parents |
300 | 300 |
301 if len(mparents) < 2 and not self.wanted(rev, wp): | 301 closed = 'close' in self.commits[rev].extra |
302 | |
303 if len(mparents) < 2 and not closed and not self.wanted(rev, wp): | |
302 # We don't want this revision. | 304 # We don't want this revision. |
303 # Update our state and tell the convert process to map this | 305 # Update our state and tell the convert process to map this |
304 # revision to the same revision its parent as mapped to. | 306 # revision to the same revision its parent as mapped to. |
305 p = None | 307 p = None |
306 if parents: | 308 if parents: |