fold: work around potential bug with filtering
authorPierre-Yves David <pierre-yves.david@ens-lyon.org>
Wed, 05 Dec 2012 11:30:24 +0100
changeset 632 cb0807646f5a
parent 631 218b540f5c93
child 633 3d5bed04ee4c
fold: work around potential bug with filtering Folded revision may be becomes filtered leading to a crash of the replaced rset.
hgext/evolve.py
--- a/hgext/evolve.py	Tue Dec 04 00:18:32 2012 +0100
+++ b/hgext/evolve.py	Wed Dec 05 11:30:24 2012 +0100
@@ -1705,7 +1705,7 @@
         finally:
             tr.release()
         ui.status('%i changesets folded\n' % len(revs))
-        if repo.revs('. and %ld', revs):
+        if repo['.'].rev() in revs:
             hg.update(repo, newid)
     finally:
         lockmod.release(lock, wlock)