Mercurial > hg
view tests/test-lrucachedict.py.out @ 22897:8fe74328f700
dirstate: merge falls through to otherparent
This lets us more correctly fix the state when we use setparents, as
demonstrated in the change in test-graft.t.
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sat, 11 Oct 2014 14:05:09 -0500 |
parents | 887ffa22fd0d |
children | 45d996a566d7 |
line wrap: on
line source
'a' in d: True d['a']: va 'b' in d: True d['b']: vb 'c' in d: True d['c']: vc 'd' in d: True d['d']: vd 'a' in d: False 'b' in d: True d['b']: vb 'c' in d: True d['c']: vc 'd' in d: True d['d']: vd 'e' in d: True d['e']: ve 'b' in d: True d['b']: vb2 'c' in d: True d['c']: vc2 'd' in d: True d['d']: vd 'e' in d: False 'f' in d: True d['f']: vf 'b' in d: False 'c' in d: False 'd' in d: False 'e' in d: False 'f' in d: False