Mercurial > hg
view tests/test-rebuildstate.t @ 21552:61151f429a5f
update: introduce --tool for controlling the merge tool
Update is a kind of merge and may also need a merge tool and should have the
options described in the merge-tools help.
author | Mads Kiilerich <madski@unity3d.com> |
---|---|
date | Mon, 19 May 2014 01:53:34 +0200 |
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 ..