Mercurial > evolve
comparison hgext/evolve.py @ 632:cb0807646f5a
fold: work around potential bug with filtering
Folded revision may be becomes filtered leading to a crash of the replaced rset.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Wed, 05 Dec 2012 11:30:24 +0100 |
parents | 218b540f5c93 |
children | ca5459892427 |
comparison
equal
deleted
inserted
replaced
631:218b540f5c93 | 632:cb0807646f5a |
---|---|
1703 for ctx in allctx]) | 1703 for ctx in allctx]) |
1704 tr.close() | 1704 tr.close() |
1705 finally: | 1705 finally: |
1706 tr.release() | 1706 tr.release() |
1707 ui.status('%i changesets folded\n' % len(revs)) | 1707 ui.status('%i changesets folded\n' % len(revs)) |
1708 if repo.revs('. and %ld', revs): | 1708 if repo['.'].rev() in revs: |
1709 hg.update(repo, newid) | 1709 hg.update(repo, newid) |
1710 finally: | 1710 finally: |
1711 lockmod.release(lock, wlock) | 1711 lockmod.release(lock, wlock) |
1712 | 1712 |
1713 | 1713 |