Rev 2306: fix pull --overwrite, especially with bundles in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Thu Mar 1 03:19:02 GMT 2007


------------------------------------------------------------
revno: 2306
revision-id: pqm at pqm.ubuntu.com-20070301031900-28686aef0de59e43
parent: pqm at pqm.ubuntu.com-20070228211048-30e18ddd8dd9c205
parent: aaron.bentley at utoronto.ca-20070301025337-ao2ls9hmiscidfg8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-01 03:19:00 +0000
message:
  fix pull --overwrite, especially with bundles
modified:
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070301025337-ao2ls9hmiscidfg8
    parent: abentley at panoramicfeedback.com-20070228213255-gezk6m0jc3p01uf3
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2007-02-28 21:53:37 -0500
    message:
      Update test case per review
    ------------------------------------------------------------
    merged: abentley at panoramicfeedback.com-20070228213255-gezk6m0jc3p01uf3
    parent: aaron.bentley at utoronto.ca-20070216001818-rlhrzftmlaune361
    committer: Aaron Bentley <abentley at panoramicfeedback.com>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2007-02-28 16:32:55 -0500
    message:
      Fix pull --overwrite for bundles
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20070216001818-rlhrzftmlaune361
    parent: abentley at panoramicfeedback.com-20070215160031-a2tj0ie8u9v30ob9
    parent: pqm at pqm.ubuntu.com-20070215181416-864dbe690a0f3da8
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Thu 2007-02-15 19:18:18 -0500
    message:
      Merge from bzr.dev



More information about the bazaar-commits mailing list