Rev 2332: (robertc) Forward port of dirstate correctness committed to bzr 0.15. in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 2332
revision-id: pqm at pqm.ubuntu.com-20070310050104-4c59f87cee46be60
parent: pqm at pqm.ubuntu.com-20070310041834-3f63de9e93982669
parent: robertc at robertcollins.net-20070310043739-5f2difugp27zkv6o
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-03-10 05:01:04 +0000
message:
  (robertc) Forward port of dirstate correctness committed to bzr 0.15.
modified:
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
  bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
  bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
  bzrlib/tests/workingtree_implementations/test_add.py test_add.py-20070226165239-4vo178spkrnhavc7-1
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20070310043739-5f2difugp27zkv6o
    parent: pqm at pqm.ubuntu.com-20070310041834-3f63de9e93982669
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Sat 2007-03-10 15:37:39 +1100
    message:
      (robertc) Forward port of dirstate correctness committed to bzr 0.15.