Rev 1865: (robertc) Merge general - status tests, removal of unneeded imports, whitespace. in /home/pqm/archives/thelove/bzr/+trunk/

Canonical.com Patch Queue Manager pqm at pqm.ubuntu.com
Sat Jul 15 16:31:16 BST 2006


------------------------------------------------------------
revno: 1865
revision-id: pqm at pqm.ubuntu.com-20060715153115-59f1601f31ecc38f
parent: pqm at pqm.ubuntu.com-20060713191849-c0cbdf94d208fa69
parent: robertc at robertcollins.net-20060715143317-e21c6ee840c74d41
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2006-07-15 16:31:15 +0100
message:
  (robertc) Merge general - status tests, removal of unneeded imports, whitespace.
modified:
  bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
  bzrlib/tests/test_revisiontree.py test_revisiontree.py-20060615095324-aij44ndxbv1h4c9f-1
  bzrlib/tests/test_status.py    test_status.py-20060516190614-fbf6432e4a6e8aa5
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060715143317-e21c6ee840c74d41
    parent: pqm at pqm.ubuntu.com-20060713191849-c0cbdf94d208fa69
    parent: robertc at robertcollins.net-20060715142903-1ef803f4af9aabc8
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: integration
    timestamp: Sun 2006-07-16 00:33:17 +1000
    message:
      (robertc) Merge general - status tests, removal of unneeded imports, whitespace.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060715142903-1ef803f4af9aabc8
    parent: robertc at robertcollins.net-20060714050237-5890683add8b2d57
    parent: pqm at pqm.ubuntu.com-20060713191849-c0cbdf94d208fa69
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: Misc cleanups.
    timestamp: Sun 2006-07-16 00:29:03 +1000
    message:
      Integrate bzr.dev.
    ------------------------------------------------------------
    merged: robertc at robertcollins.net-20060714050237-5890683add8b2d57
    parent: pqm at pqm.ubuntu.com-20060711204542-8e872becb9b4caf9
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: Misc cleanups.
    timestamp: Fri 2006-07-14 15:02:37 +1000
    message:
      General cleanups - status, add a status test with two revision trees, and commands.py importing of bzrlib.trace.



More information about the bazaar-commits mailing list