comparison tests/test-obsolete.t @ 3914:96945ea908df stable

branching: merge default into stable

The stable branch of Mercurial core now contains Mercurial 4.7 so evolve branch
policy requires this merge. The @ bookmark is in the right location, so people
doing clone will get to the latest release.

3901:f2b8429db565

  3
  - 0d3f46688ccc
  4
  - 725c380fe99b
  $ hg up --hidden 3 -q
  updating to a hidden changeset 0d3f46688ccc
  (hidden revision '0d3f46688ccc' was rewritten as: 725c380fe99b)
  working directory parent is obsolete! (0d3f46688ccc)
(reported by parents too)
  $ hg parents
  changeset:   3:0d3f46688ccc

  instability: content-divergent
  summary:     add obsolet_conflicting_d
  

  $ hg up --hidden 3 -q
  updating to a hidden changeset 0d3f46688ccc
  (hidden revision '0d3f46688ccc' has diverged)
  working directory parent is obsolete! (0d3f46688ccc)
  $ hg evolve
  parent is obsolete with multiple successors:
  [4] add obsol_c'

  

Check import reports new unstable changeset:

  $ hg up --hidden 2
  updating to a hidden changeset 4538525df7e2
  (hidden revision '4538525df7e2' has diverged)
  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 --content-divergent' to resolve the issue)
  $ hg export 9468a5f5d8b2 | hg import -
  applying patch from stdin
  1 new orphan changesets

3914:96945ea908df

  3
  - 0d3f46688ccc
  4
  - 725c380fe99b
  $ hg up --hidden 3 -q
  updated to hidden changeset 0d3f46688ccc
  (hidden revision '0d3f46688ccc' was rewritten as: 725c380fe99b)
  working directory parent is obsolete! (0d3f46688ccc)
(reported by parents too)
  $ hg parents
  changeset:   3:0d3f46688ccc

  instability: content-divergent
  summary:     add obsolet_conflicting_d
  

  $ hg up --hidden 3 -q
  updated to hidden changeset 0d3f46688ccc
  (hidden revision '0d3f46688ccc' has diverged)
  working directory parent is obsolete! (0d3f46688ccc)
  $ hg evolve
  parent is obsolete with multiple successors:
  [4] add obsol_c'

  

Check import reports new unstable changeset:

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