tests/test-merge8.t
author Pierre-Yves David <pierre-yves.david@fb.com>
Wed, 26 Feb 2014 18:56:27 -0800
changeset 20571 d4893e64f300
parent 16913 f2719b387380
child 34661 eb586ed5d8ce
permissions -rw-r--r--
revert: extract actual revert in its own function With this small refactoring, the computation of the action to perform and the actual change to the disk happen in different function. This allows extension to wrap the later in case of need. The initial motivation is the `remotefilelog` extension that need to prefetch all the file content to be checked out.

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