comparison tests/test-topic-stack.t @ 3592:7a5c3175015e mercurial-4.2

test-compat: merge mercurial-4.3 into mercurial-4.2

3591:98941c28f3e2

  ### target: default (branch)
  t3$ c_I (unstable)
  t2@ c_G (current)
  t1: c_D
  t0^ c_A (base)
  $ hg --config extensions.evolve=  --config ui.interactive=yes split << EOF
  > y
  > y
  > n
  > y
  > EOF

  o  dde94df880e9 (22) c_G
  |
  | @  e7ea874afbd5 (23) c_G
  |/
  x  b24bab30ac12 (21) c_G
  |    rewritten as dde94df880e9, e7ea874afbd5 by test (Thu Jan 01 00:00:00 1970 +0000)
  |
  x  907f7d3c2333 (18) c_G
  |    rewritten as b24bab30ac12 by test (Thu Jan 01 00:00:00 1970 +0000)
  |
  x  3ab2eedae500 (13) c_G
  |    rewritten as 907f7d3c2333 by test (Thu Jan 01 00:00:00 1970 +0000)
  |
  x  c7d60a180d05 (6) c_G
       rewritten as 3ab2eedae500 by test (Thu Jan 01 00:00:00 1970 +0000)
  
  $ hg export .
  # HG changeset patch
  # User test3
  # Date 0 0

3592:7a5c3175015e

  ### target: default (branch)
  t3$ c_I (unstable)
  t2@ c_G (current)
  t1: c_D
  t0^ c_A (base)
  $ hg --config extensions.evolve=  --config ui.interactive=yes split --date '0 0' << EOF
  > y
  > y
  > n
  > y
  > EOF

  o  dde94df880e9 (22) c_G
  |
  | @  e7ea874afbd5 (23) c_G
  |/
  x  b24bab30ac12 (21) c_G
  |    rewritten(parent, content) as dde94df880e9, e7ea874afbd5 by test (*) (glob)
  |
  x  907f7d3c2333 (18) c_G
  |    rewritten as b24bab30ac12 by test (*) (glob)
  |
  x  3ab2eedae500 (13) c_G
  |    rewritten as 907f7d3c2333 by test (*) (glob)
  |
  x  c7d60a180d05 (6) c_G
       rewritten as 3ab2eedae500 by test (*) (glob)
  
  $ hg export .
  # HG changeset patch
  # User test3
  # Date 0 0