tests/test-revset-dirstate-parents.t
author Martin Geisler <mg@aragost.com>
Fri, 09 Dec 2011 17:34:53 +0100
changeset 15625 efdcce3fd2d5
parent 12936 bdb766e64d35
child 16218 81a1a00f5738
permissions -rw-r--r--
merge: make debug output easier to read I always found it hard to figure out what the debug code meant without the separators.

  $ HGENCODING=utf-8
  $ export HGENCODING

  $ try() {
  >   hg debugrevspec --debug $@
  > }

  $ log() {
  >   hg log --template '{rev}\n' -r "$1"
  > }

  $ hg init repo
  $ cd repo

  $ try 'p1()'
  ('func', ('symbol', 'p1'), None)
  $ try 'p2()'
  ('func', ('symbol', 'p2'), None)
  $ try 'parents()'
  ('func', ('symbol', 'parents'), None)

null revision
  $ log 'p1()'
  $ log 'p2()'
  $ log 'parents()'

working dir with a single parent
  $ echo a > a
  $ hg ci -Aqm0
  $ log 'p1()'
  0
  $ log 'tag() and p1()'
  $ log 'p2()'
  $ log 'parents()'
  0
  $ log 'tag() and parents()'

merge in progress
  $ echo b > b
  $ hg ci -Aqm1
  $ hg up -q 0
  $ echo c > c
  $ hg ci -Aqm2
  $ hg merge -q
  $ log 'p1()'
  2
  $ log 'p2()'
  1
  $ log 'tag() and p2()'
  $ log 'parents()'
  1
  2