~bzr-pqm/bzr/bzr.dev

Committer: Robert Collins
Date: 2006-07-14 05:02:37 UTC
mto: <a title="Merged In 1852.3.2" href="/~bzr-pqm/bzr/bzr.dev/revision/1852.3.2?remember=5200.3.3">(1852.3.2 Cleanup workingtree.) <a title="Merged In 1864.1.1" href="/~bzr-pqm/bzr/bzr.dev/revision/1864.1.1?remember=5200.3.3">(1864.1.1 integration)
mto: This revision was merged to the branch mainline in revision 1865 .
Revision ID: robertc@robertcollins.net-20060714050237-5890683add8b2d57

General cleanups - status, add a status test with two revision trees, and commands.py importing of bzrlib.trace.

added added

removed removed

[self.rev_id],

self.t.branch.repository.revision_tree(revid_2).get_parent_ids())

# TODO commit a merge and check it is reported correctly.