- 
Committer:
John Arbash Meinel
- 
Date:
2007-02-26 21:17:03 UTC
- 
mto:
(2255.11.3 dirstate)
- 
mto:
This revision was merged to the branch mainline in
revision
2322.
- 
Revision ID:
john@arbash-meinel.com-20070226211703-hqcam97hrxohk5jc
Make set_root_id() a no-op if the id doesn't change,
and change the test_merge_core tests to flush the state to disk, since
they are hanging onto a write lock.