tests/test-merge8.t
author Sean Farley <sean.michael.farley@gmail.com>
Mon, 21 Apr 2014 21:39:10 -0500
changeset 21473 ef9b2bea9709
parent 16913 f2719b387380
child 34661 eb586ed5d8ce
permissions -rw-r--r--
context: add a no-op _prestatus method This patch adds a private _prestatus method so that certain contexts, such as workingctx, can add custom pre-processing to status.

Test for changeset ba7c74081861
(update dirstate correctly for non-branchmerge updates)
  $ hg init a
  $ cd a
  $ echo a > a
  $ hg add a
  $ hg commit -m a
  $ cd ..
  $ hg clone a b
  updating to branch default
  1 files updated, 0 files merged, 0 files removed, 0 files unresolved
  $ cd a
  $ hg mv a b
  $ hg commit -m move
  $ echo b >> b
  $ hg commit -m b
  $ cd ../b
  $ hg pull ../a
  pulling from ../a
  searching for changes
  adding changesets
  adding manifests
  adding file changes
  added 2 changesets with 2 changes to 1 files
  (run 'hg update' to get a working copy)
  $ hg update
  1 files updated, 0 files merged, 1 files removed, 0 files unresolved

  $ cd ..