view tests/test-manifest-merging.t @ 35891:75d9dcb64e7d

obsolete: drop deprecated methods (API)

.. api::

   The following deprecated methods have been removed from obsolete, with
   replacements:

    - _addprecursors() -> _addpredecessors()
    - obsstore.precursors -> obsstore.predecessors
    - allprecursors() -> obsutil.allprecursors()
    - allsuccessors() -> obsutil.allsuccessors()
    - marker() -> obsutil.marker
    - getmarkers() -> obsutil.getmarkers()
    - exclusivemarkers() -> obsutil.exclusivemarkers()
    - foreground() -> obsutil.foreground()
    - successorssets() -> obsutil.successorsset()
    - unstable() -> orphan()
    - bumped() -> phasedivergent()
    - divergent() -> contentdivergent()

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