# HG changeset patch # User Pierre-Yves David # Date 1414015086 25200 # Node ID db16c4ad15d0118a74e0fa39e82dc2b8b1f275e6 # Parent 7173c70ab2c37b451412ce06bf7147f4f7a3b0c7 fixup previous changesets (after forgot to amend). diff -r 7173c70ab2c3 -r db16c4ad15d0 hgext/evolve.py --- a/hgext/evolve.py Mon Oct 20 15:59:34 2014 -0700 +++ b/hgext/evolve.py Wed Oct 22 14:58:06 2014 -0700 @@ -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)