Rev 1982: (robertc) integrate merge_from_branch patch: adds a convenience method "merge_from_branch" to WorkingTree. in file:///home/robertc/source/baz/integration/

[Robert Collins]

------------------------------------------------------------
revno: 1982
revision-id: robertc at robertcollins.net-20060904080048-aff24d32f888b21d
parent: pqm at pqm.ubuntu.com-20060901173735-543e9acad03760d1
parent: robertc at robertcollins.net-20060904080000-1152da5eed765694
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2006-09-04 18:00:48 +1000
message:
  (robertc) integrate merge_from_branch patch: adds a convenience method "merge_from_branch" to WorkingTree.
added:
  bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
modified:
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
  bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
  bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
  bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
  bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
  bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
  bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
  bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
  bzrlib/tests/test_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
  bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
  bzrlib/tests/workingtree_implementations/test_get_parent_ids.py test_get_parent_ids.py-20060616123734-jq0zc755ud2u644s-1
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060904080000-1152da5eed765694
    parent: pqm at pqm.ubuntu.com-20060831182704-2de4cd234a448ed1
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: merge_from_branch
    timestamp: Mon 2006-09-04 18:00:00 +1000
    message:
      (robertc) adds a convenience method "merge_from_branch" to WorkingTree.