tests/test-rebuildstate.t
author Siddharth Agarwal <sid0@fb.com>
Sun, 11 Oct 2015 12:56:21 -0700
changeset 26606 2a405d307f8c
parent 23840 ddc17eaf0f1b
child 27174 9fbe3545e4bd
permissions -rw-r--r--
filemerge: also return whether the merge is complete In future patches, we'll pause merges after the premerge step. After the premerge step we'll return complete = False.

basic test for hg debugrebuildstate

  $ hg init repo
  $ cd repo

  $ touch foo bar
  $ hg ci -Am 'add foo bar'
  adding bar
  adding foo

  $ touch baz
  $ hg add baz
  $ hg rm bar

  $ hg debugrebuildstate

state dump after

  $ hg debugstate --nodates | sort
  n 644         -1 set                 bar
  n 644         -1 set                 foo

status

  $ hg st -A
  ! bar
  ? baz
  C foo

  $ cd ..