Mercurial > hg-stable

diff tests/test-revset.t @ 42457:43c8f72184f4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revset: fix merge() to fall back to changectx API if wdir specified I have a code which basically runs "0:wdir() & <user-revset>", and it crashed if merge() were passed in.
author Yuya Nishihara <yuya@tcha.org>
date Sun, 09 Jun 2019 22:23:41 +0900
parents 838f3a094b4f
children 99ebde4fec99
line wrap: on
line diff
--- a/tests/test-revset.t	Sun Jun 09 22:18:22 2019 +0900
+++ b/tests/test-revset.t	Sun Jun 09 22:23:41 2019 +0900
@@ -2076,6 +2076,17 @@
   $ log 'parents(merge())'
   4
   5
+
+  $ hg merge 7
+  0 files updated, 0 files merged, 0 files removed, 0 files unresolved
+  (branch merge, don't forget to commit)
+  $ log '0:wdir() & merge()'
+  6
+  2147483647
+  $ hg update -qC .
+  $ log '0:wdir() & merge()'
+  6
+
   $ log 'p1(branchpoint())'
   0
   2