Mercurial > hg > evolve

changeset 1231:db16c4ad15d0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixup previous changesets (after forgot to amend).
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 22 Oct 2014 14:58:06 -0700
parents 7173c70ab2c3
children e9900a4af996
files hgext/evolve.py
diffstat 1 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/hgext/evolve.py
+++ b/hgext/evolve.py
@@ -1655,8 +1655,10 @@
                            "ancestors(bookmark() and not bookmark(%s)) - "
                            "obsolete()",
                            mark, mark, mark)
+        revs = set(revs)
         revs.update(set(rsrevs))
-    return marks,revs
+        revs = sorted(revs)
+    return marks, revs
 
 def _deletebookmark(ui, marks, mark):
     del marks[mark]
@@ -1737,7 +1739,9 @@
             raise util.Abort('nothing to prune')
 
         # defines successors changesets
-        sucs = tuple(repo[n] for n in scmutil.revrange(repo, succs))
+        sucs = scmutil.revrange(repo, succs)
+        sucs.sort()
+        sucs = tuple(repo[n] for n in sucs)
         if not biject and len(sucs) > 1 and len(precs) > 1:
             msg = "Can't use multiple successors for multiple precursors"
             raise util.Abort(msg)