Rev 1825: Merge handles contents + executable + deletion conflict in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Fri Jun 30 12:38:22 BST 2006


------------------------------------------------------------
revno: 1825
revision-id: pqm at pqm.ubuntu.com-20060630113821-02c5914482b84bb2
parent: pqm at pqm.ubuntu.com-20060629182157-cdc39b5f9e4fac85
parent: aaron.bentley at utoronto.ca-20060629061138-6230b820695698b0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2006-06-30 12:38:21 +0100
message:
  Merge handles contents + executable + deletion conflict
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-20060629061138-6230b820695698b0
    parent: aaron.bentley at utoronto.ca-20060628050714-f5c68e380ac36c41
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ttransform
    timestamp: Thu 2006-06-29 02:11:38 -0400
    message:
      Merge handles contents + executable + deletion conflict
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060628050714-f5c68e380ac36c41
    parent: aaron.bentley at utoronto.ca-20060525042123-3289bf33a73ef194
    parent: pqm at pqm.ubuntu.com-20060627133154-3f28e249ed8815db
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: bzr.ttransform
    timestamp: Wed 2006-06-28 01:07:14 -0400
    message:
      Merge mainline



More information about the bazaar-commits mailing list