comparison tests/test-evolve-orphan-merge.t @ 5097:f0c18ad24273 stable

tests: allow an empty merge commit to have tests pass without too many changes

Not the greatest fix, but this allows us to have the same test case for all
versions of Mercurial.

Hash of 29 changes because instead of both parents only one is set in hg 5.3.

5096:6742ce189373

merge them again. After getting their work done, they may want to get rid of
that branch and they prune all their changeset, which will result in this
case where merge commit becomes orphan with its ancestors pruned up until a
point where the other parent of merge is the first non-pruned ancestor.

  $ hg evolve -r .
  move:[28] merged l and x
  atop:[0] added hgignore
  working directory is now at b61ba77b924a

  $ hg glog
  @  29:b61ba77b924a merged l and x
  |   () draft
  o  0:8fa14d15e168 added hgignore
      () draft

7) When one parent is pruned without successor and has no parent

5097:f0c18ad24273

merge them again. After getting their work done, they may want to get rid of
that branch and they prune all their changeset, which will result in this
case where merge commit becomes orphan with its ancestors pruned up until a
point where the other parent of merge is the first non-pruned ancestor.

Note: allowing an empty commit here to have the same output on all hg versions.
In newer versions or Mercurial this command would not create a new commit.
hg <= 5.2 (32d11a23c9cf)

  $ hg evolve -r . --config ui.allowemptycommit=true
  move:[28] merged l and x
  atop:[0] added hgignore
  working directory is now at * (glob)

  $ hg glog
  @  29:* merged l and x (glob)
  |   () draft
  o  0:8fa14d15e168 added hgignore
      () draft

7) When one parent is pruned without successor and has no parent