comparison tests/test-obsolete.t @ 3002:00e4d31b8cdb mercurial-4.1

compat-test: merge future 6.7.0 into 4.1 compat branch

(mergeing through 4.2 compat branch)

2809:f25c79365f5d

  [4] add obsol_c'
  [10] add obsol_c
  [2]
  $ hg olog
  @  0d3f46688ccc (3) add obsol_c
  |    rewritten(parent) by test (*) as 2033b4e49474 (glob)
  |    rewritten by test (*) as 725c380fe99b (glob)
  |
  x  4538525df7e2 (2) add c
       rewritten by test (*) as 0d3f46688ccc (glob)
  

Check import reports new unstable changeset:

  $ hg up --hidden 2
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  working directory parent is obsolete! (4538525df7e2)
  (4538525df7e2 has diverged, use 'hg evolve --list --divergent' to resolve the issue)
  $ hg export 9468a5f5d8b2 | hg import -
  applying patch from stdin
  1 new unstable changesets

3002:00e4d31b8cdb

  [4] add obsol_c'
  [10] add obsol_c
  [2]
  $ hg olog
  @  0d3f46688ccc (3) add obsol_c
  |    rewritten(parent) as 2033b4e49474 by test (*) (glob)
  |    rewritten as 725c380fe99b by test (*) (glob)
  |
  x  4538525df7e2 (2) add c
       rewritten as 0d3f46688ccc by test (*) (glob)
  

Check import reports new unstable changeset:

  $ hg up --hidden 2
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved
  working directory parent is obsolete! (4538525df7e2)
  (4538525df7e2 has diverged, use 'hg evolve --list --contentdivergent' to resolve the issue)
  $ hg export 9468a5f5d8b2 | hg import -
  applying patch from stdin
  1 new unstable changesets