Mercurial > hg

view tests/test-rebuildstate.t @ 26618:8e6d5b7317e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge.mergestate: perform all premerges before any merges (BC) We perform all that we can non-interactively before prompting the user for input via their merge tool. This allows for a maximally consistent state when the user is first prompted. The test output changes indicate the actual behavior change happening.
author Siddharth Agarwal <sid0@fb.com>
date Sun, 11 Oct 2015 21:56:39 -0700
parents ddc17eaf0f1b
children 9fbe3545e4bd
line wrap: on
line source

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