Rev 1472: Move add_pending_merge to WorkingTree. in /home/robertc/source/baz/bzr-workingtree

------------------------------------------------------------
revno: 1472
revision-id: robertc at robertcollins.net-20051105231911-daec2c32fe7ca454
parent: robertc at robertcollins.net-20051105230107-63b2bb28dd1f6199
committer: Robert Collins <robertc at robertcollins.net>
timestamp: Sat 2005-11-05 18:19:11 -0500
message:
  Move add_pending_merge to WorkingTree.
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/selftest/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
  bzrlib/selftest/testbranch.py  testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/selftest/testinv.py     testinv.py-20050722220913-1dc326138d1a5892
  bzrlib/selftest/testrevision.py testrevision.py-20050804210559-46f5e1eb67b01289
  bzrlib/selftest/teststatus.py  teststatus.py-20050712014354-508855eb9f29f7dc
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3