Rev 1595: Fixed merge-type weave in /home/pqm/archives/thelove/bzr/+trunk/

[Canonical.com Patch Queue Manager]

------------------------------------------------------------
revno: 1595
revision-id: pqm at pqm.ubuntu.com-20060322082009-3520c8aac5775bea
parent: pqm at pqm.ubuntu.com-20060321220428-480db3eb2b5cd932
parent: aaron.bentley at utoronto.ca-20060322042217-bdc20e3a63a9c03b
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-22 08:20:09 +0000
message:
  Fixed merge-type weave
modified:
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060322042217-bdc20e3a63a9c03b
    parent: abentley at panoramicfeedback.com-20060321221018-69f25fb1f6436eab
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.weavemerge
    timestamp: Tue 2006-03-21 23:22:17 -0500
    message:
      Fixed merge-type weave
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060321221018-69f25fb1f6436eab
    parent: abentley at panoramicfeedback.com-20060321144742-81f3405d3ede7519
    parent: pqm at pqm.ubuntu.com-20060321220428-480db3eb2b5cd932
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab.integration
    timestamp: Tue 2006-03-21 17:10:18 -0500
    message:
      merge from bzr.dev
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20060321144742-81f3405d3ede7519
    parent: aaron.bentley at utoronto.ca-20060319174208-c580f1144110ac11
    parent: pqm at pqm.ubuntu.com-20060321143713-b999444e4c2f3687
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: bzr.ab.integration
    timestamp: Tue 2006-03-21 09:47:42 -0500
    message:
      Merge from bzr.dev
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060319174208-c580f1144110ac11
    parent: aaron.bentley at utoronto.ca-20060317044300-53ac63fe3d4a3966
    parent: pqm at pqm.ubuntu.com-20060319161404-bbeddf282f11af63
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ab.integration
    timestamp: Sun 2006-03-19 12:42:08 -0500
    message:
      Merge from mainline