comparison tests/test-evolve-issue5958.t @ 5475:21956b2a16eb

evolve: add more testing for parent-child form content-div

this patch add second variant of "changeset we initiated the
resolution (of content-divergent changesets which are in parent-child
form) from"

5474:86c6c7951f74

  o  changeset:   0:a24ed8ad918c
     user:        test
     date:        Thu Jan 01 00:00:00 1970 +0000
     summary:     add r0
  

5475:21956b2a16eb

  o  changeset:   0:a24ed8ad918c
     user:        test
     date:        Thu Jan 01 00:00:00 1970 +0000
     summary:     add r0
  
test that resolution is consistent and independent of divergent changeset we initiate the resolution from

  $ hg strip . --config extensions.strip=
  0 files updated, 0 files merged, 3 files removed, 0 files unresolved
  saved backup bundle to $TESTTMP/issue5958/.hg/strip-backup/17e66b2fbf1b-080f2943-backup.hg
  2 new content-divergent changesets
  $ hg up 4
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ hg evolve --content-divergent
  merge:[4] add foo.txt
  with: [6] add foo.txt
  base: [1] add foo.txt
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved
  working directory is now at 17e66b2fbf1b
  $ hg log -G
  @  changeset:   7:17e66b2fbf1b
  |  tag:         tip
  |  parent:      0:a24ed8ad918c
  |  user:        test
  |  date:        Wed Dec 31 23:59:58 1969 -0000
  |  summary:     add foo.txt
  |
  o  changeset:   0:a24ed8ad918c
     user:        test
     date:        Thu Jan 01 00:00:00 1970 +0000
     summary:     add r0