Mercurial > hg
view tests/test-hgk.t @ 22896:7e9cbb9c6053
dirstate: use 'm' state in otherparent to reduce ambiguity
In rebase-like operations where we abandon the second parent, we can
correctly fix up the state in setparents.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Fri, 10 Oct 2014 13:31:06 -0500 |
parents | cf72fd8b3072 |
children | 5fb1fc2e1281 |
line wrap: on
line source
Minimal hgk check $ echo "[extensions]" >> $HGRCPATH $ echo "hgk=" >> $HGRCPATH $ hg init repo $ cd repo $ echo a > a $ hg ci -Am adda adding a $ hg debug-cat-file commit 0 tree a0c8bcbbb45c parent 000000000000 author test 0 0 revision 0 branch default phase draft adda $ cd ..