# HG changeset patch
# User Yuya Nishihara <yuya@tcha.org>
# Date 1497756323 -32400
# Node ID 8e02829bec6135f4ec96bb68b54de2c3f56dbc09
# Parent  9d472b219fb07e011c7a6255c5be47e6fc66229c
revset: fix negative ancestor spec to not return changectx objects

The order was unstable because of this.

diff -r 9d472b219fb0 -r 8e02829bec61 mercurial/revset.py
--- a/mercurial/revset.py	Mon May 01 05:57:36 2017 +0200
+++ b/mercurial/revset.py	Sun Jun 18 12:25:23 2017 +0900
@@ -392,7 +392,7 @@
             if len(c) > 1:
                 raise error.RepoLookupError(
                     _("revision in set has more than one child"))
-            r = c[0]
+            r = c[0].rev()
         else:
             cs.add(r)
     return subset & cs
diff -r 9d472b219fb0 -r 8e02829bec61 tests/test-revset.t
--- a/tests/test-revset.t	Mon May 01 05:57:36 2017 +0200
+++ b/tests/test-revset.t	Sun Jun 18 12:25:23 2017 +0900
@@ -3131,9 +3131,11 @@
   $ log 'merge()^^^'
   1
 
-  $ log '(merge() | 0)~-1'
+  $ hg debugrevspec -s '(merge() | 0)~-1'
+  * set:
+  <baseset+ [1, 7]>
+  1
   7
-  1
   $ log 'merge()~-1'
   7
   $ log 'tip~-1'