Mercurial > hg > mercurial-crew-with-dirclash
comparison tests/test-merge4 @ 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 | e506c14382fd |
children |
comparison
equal
deleted
inserted
replaced
4933:667290b6c95e | 4934:a11921d24ec4 |
---|