Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-branches.out @ 4934:a11921d24ec4
add dirstate._dirtypl variable
Theoretically, it's possible to forget modified dirstate
parents by doing:
dirstate.invalidate()
dirstate.setparents(p1, p2)
dirstate._map
The final access to _map should call _read(), which will
unconditionally overwrite dirstate._pl.
This doesn't actually happen right now because invalidate
accidentally ends up rebuilding dirstate._map.
author | Alexis S. L. Carvalho <alexis@cecm.usp.br> |
---|---|
date | Thu, 19 Jul 2007 19:43:25 -0300 |
parents | 6858a7477a5e |
children |
line wrap: on
line source
marked working directory as branch a 0 files updated, 0 files merged, 1 files removed, 0 files unresolved marked working directory as branch b 0 files updated, 0 files merged, 1 files removed, 0 files unresolved marked working directory as branch c c 5:5ca481e59b8c a 1:dd6b440dd85a b 4:22df7444f7c1 (inactive) default 0:19709c5a4e75 (inactive) ------- c 5:5ca481e59b8c a 1:dd6b440dd85a