Rev 1574: Stop using deprecated methods in merge and revert in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Wed Mar 8 14:34:44 GMT 2006


------------------------------------------------------------
revno: 1574
revision-id: pqm at pqm.ubuntu.com-20060308143442-fc633cddf3574063
parent: pqm at pqm.ubuntu.com-20060308051838-876e9f9ac39ee578
parent: aaron.bentley at utoronto.ca-20060308060843-7284a9b71ec43c21
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-03-08 14:34:42 +0000
message:
  Stop using deprecated methods in merge and revert
modified:
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060308060843-7284a9b71ec43c21
    parent: aaron.bentley at utoronto.ca-20060308052702-d6f40f6caa925eeb
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-03-08 01:08:43 -0500
    message:
      Stop using deprecated methods in merge and revert
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060308052702-d6f40f6caa925eeb
    parent: abentley at panoramicfeedback.com-20060306174748-6a009f0b725d8bdd
    parent: aaron.bentley at utoronto.ca-20060308052522-807c265697989dce
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's mergeable stuff
    timestamp: Wed 2006-03-08 00:27:02 -0500
    message:
      Merge from bzr.ab.integration
    ------------------------------------------------------------
    merged: aaron.bentley at utoronto.ca-20060308052522-807c265697989dce
    parent: abentley at panoramicfeedback.com-20060307184118-b18cf90f2bf4e6d8
    parent: pqm at pqm.ubuntu.com-20060308030318-87f0fbd9525bb170
    committer: Aaron Bentley <aaron.bentley at utoronto.ca>
    branch nick: Aaron's integration
    timestamp: Wed 2006-03-08 00:25:22 -0500
    message:
      merge from mainline



More information about the bazaar-commits mailing list