annotate tests/test-manifest-merging.t @ 46315:2ef575c62f10

test-regression: backing out D9640 (63c923fd7fa8)

Since D9640 was pushed, we have seen failure on at least:

- test-commit-interactive.t
- test-i18n.t
- test-log.t

The author that change requested it to be removed until he can investigate.

For reference: https://phab.mercurial-scm.org/D9640

Backed out changeset 63c923fd7fa8

Differential Revision: https://phab.mercurial-scm.org/D9803

  $ hg init base

  $ cd base
  $ echo 'alpha' > alpha
  $ hg ci -A -m 'add alpha'
  adding alpha
  $ cd ..

  $ hg clone base work
  updating to branch default
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ cd work
  $ echo 'beta' > beta
  $ hg ci -A -m 'add beta'
  adding beta
  $ cd ..

  $ cd base
  $ echo 'gamma' > gamma
  $ hg ci -A -m 'add gamma'
  adding gamma
  $ cd ..

  $ cd work
  $ hg pull -q
  $ hg merge
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  (branch merge, don't forget to commit)

Update --clean to revision 1 to simulate a failed merge:

  $ rm alpha beta gamma
  $ hg update --clean 1
  2 files updated, 0 files merged, 0 files removed, 0 files unresolved

  $ cd ..