Mercurial > hg

view tests/test-rebuildstate.t @ 23024:ec36969497de

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
resolve: run happily after conflict-free merge
author Martin von Zweigbergk <martinvonz@gmail.com>
date Wed, 08 Oct 2014 22:30:04 -0700
parents f2719b387380
children ddc17eaf0f1b
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 bar
  n 644         -1 foo

status

  $ hg st -A
  ! bar
  ? baz
  C foo

  $ cd ..