Viewing all changes in revision 2255.2.161.

Committer: Martin Pool
Date: 2007-03-01 03:44:56 UTC
mfrom: <a title="Merged From 2255.7.35" href="/~bzr-pqm/bzr/bzr.dev/revision/2255.7.35?remember=5814">(2255.7.35 dirstate)
mto: <a title="Merged In 2255.13.2" href="/~bzr-pqm/bzr/bzr.dev/revision/2255.13.2?remember=5814">(2255.13.2 subtree) <a title="Merged In 2321.1.1" href="/~bzr-pqm/bzr/bzr.dev/revision/2321.1.1?remember=5814">(2321.1.1 integration)
mto: This revision was merged to the branch mainline in revision 2322 .
Revision ID: mbp@sourcefrog.net-20070301034456-ck62y1icsmsp1a8n

merge some of dirstate, update comparison tests to keep tree roots the same unless they're meant to differ

added added

removed removed