Rev 1779: (robertc, abentley)Teach all trees about unknowns, conflicts and get_parent_ids. in file:///home/robertc/source/baz/integration/

[Robert Collins]

------------------------------------------------------------
revno: 1779
revision-id: robertc at robertcollins.net-20060616155007-952bb7014e00093c
parent: robertc at robertcollins.net-20060616154020-aff002ca470b7526
parent: robertc at robertcollins.net-20060616152515-961fbde13f8a3527
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Sat 2006-06-17 01:50:07 +1000
message:
  (robertc,abentley)Teach all trees about unknowns, conflicts and get_parent_ids.
added:
  bzrlib/tests/test_emptytree.py test_emptytree.py-20060616125947-2s513d9t8qekil06-1
  bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
  bzrlib/tests/workingtree_implementations/test_get_parent_ids.py test_get_parent_ids.py-20060616123734-jq0zc755ud2u644s-1
modified:
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
  bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060616152515-961fbde13f8a3527
    parent: robertc at robertcollins.net-20060615172625-a81c2730c2c22f18
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: workingtree
    timestamp: Sat 2006-06-17 01:25:15 +1000
    message:
      Teach all trees about unknowns, conflicts and get_parent_ids.