Rev 1645: (mbp) two small cleanups in /home/pqm/archives/thelove/bzr/+trunk/

Wed Apr 19 06:50:40 BST 2006

------------------------------------------------------------
revno: 1645
revision-id: pqm at pqm.ubuntu.com-20060419055038-883365ee042f9946
parent: pqm at pqm.ubuntu.com-20060418055925-0f7129a54583f4d8
parent: mbp at sourcefrog.net-20060418064941-d6a8c9a334e9e7e1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-04-19 06:50:38 +0100
message:
  (mbp) two small cleanups
modified:
  BRANCH.TODO                    BRANCH.TODO-20060103052123-79ac4969351c03a9
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/tests/test_escaped_store.py test_escaped_store.py-20060216023929-6bcb9a067344959f
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060418064941-d6a8c9a334e9e7e1
    parent: mbp at sourcefrog.net-20060418043844-dbaac5bdecaed3d1
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Tue 2006-04-18 16:49:41 +1000
    message:
      (test_escaped_store) Avoid calling deprecated WeaveStore.get_lines method
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060418043844-dbaac5bdecaed3d1
    parent: mbp at sourcefrog.net-20060418004802-80796653fdb4220f
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Tue 2006-04-18 14:38:44 +1000
    message:
      Clear out BRANCH.TODO - most of them are done now
    ------------------------------------------------------------
    merged: mbp at sourcefrog.net-20060418004802-80796653fdb4220f
    parent: mbp at sourcefrog.net-20060414012652-79ef6d9d753bfe00
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: bzr.mbp.integration
    timestamp: Tue 2006-04-18 10:48:02 +1000
    message:
      Remove duplicate definition of option --short