view tests/test-manifest-merging.t @ 46393:66e8e279133b

hghave: list the module needed for the `vcr` check

I'm tired of having to look up modules each time I setup a system, and try to
distinguish between similar package names to get the right one.  Now that the
search API has been disabled, it's even harder.  There are other python packages
here that should be listed like this, but this is the one that came up missing
today, so it's a start.

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

  $ 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 ..