~bzr-pqm/bzr/bzr.dev

Committer: Robert Collins
Date: 2006-07-15 14:33:17 UTC
mfrom: <a title="Merged From 1852.2.2" href="/~bzr-pqm/bzr/bzr.dev/revision/1852.2.2?remember=1728.1.1">(1852.2.2 Misc cleanups.)
mto: <a title="Merged In 1852.3.3" href="/~bzr-pqm/bzr/bzr.dev/revision/1852.3.3?remember=1728.1.1">(1852.3.3 Cleanup workingtree.)
mto: This revision was merged to the branch mainline in revision 1865 .
Revision ID: robertc@robertcollins.net-20060715143317-e21c6ee840c74d41

(robertc) Merge general - status tests, removal of unneeded imports, whitespace.

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.