comparison tests/test-evolve-content-divergence-meta.t @ 4483:7978230faa32 stable

evolve: make sure div resolution don't replace the initial author (issue6113)

Before this patch, divergence resolution logic taking the current user who
is running the resolution command as the author of commit that will
be created after merging the two divergent csets.
This patch make sure that we preserve the initial author.
Changes in test file reflect the fixed behaviour.

4482:ee7e4e05ce44

  with: [4] added c
  base: [2] added c
  updating to "local" side of the conflict: 0c9267e23c9d
  merging "other" content-divergent changeset '6c06cda6dc99'
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  working directory is now at 7d41fb83d892

Make sure resultant cset don't replace the initial user with user running the command:
  $ hg log -r tip
  changeset:   5:7d41fb83d892
  tag:         tip
  parent:      1:1740ad2a1eda
  user:        bar <[e-mail]>
  date:        Thu Jan 01 00:00:00 1970 +0000
  summary:     added c e
  

4483:7978230faa32

  with: [4] added c
  base: [2] added c
  updating to "local" side of the conflict: 0c9267e23c9d
  merging "other" content-divergent changeset '6c06cda6dc99'
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  working directory is now at 443bd2972210

Make sure resultant cset don't replace the initial user with user running the command:
  $ hg log -r tip
  changeset:   5:443bd2972210
  tag:         tip
  parent:      1:1740ad2a1eda
  user:        foo <[e-mail]>
  date:        Thu Jan 01 00:00:00 1970 +0000
  summary:     added c e