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

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.

42456:d279e4f453c4

  $ log 'p2(merge())'
  4
  $ log 'parents(merge())'
  4
  5
  $ log 'p1(branchpoint())'
  0
  2
  $ log 'p2(branchpoint())'
  $ log 'parents(branchpoint())'

42457:43c8f72184f4

  $ log 'p2(merge())'
  4
  $ 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
  $ log 'p2(branchpoint())'
  $ log 'parents(branchpoint())'