Rev 3219: merge bzr.dev in file:///v/home/vila/src/bzr/experimental/selftest/

Vincent Ladeuil v.ladeuil+lp at free.fr
Sat Mar 1 10:26:11 GMT 2008


At file:///v/home/vila/src/bzr/experimental/selftest/

------------------------------------------------------------
revno: 3219
revision-id:v.ladeuil+lp at free.fr-20080301102554-4dg5gzf7ulp64uv2
parent: v.ladeuil+lp at free.fr-20080215174418-yuz71exbzem97ev9
parent: pqm at pqm.ubuntu.com-20080229011300-p50it0si2y8mbv0d
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: selftest
timestamp: Sat 2008-03-01 11:25:54 +0100
message:
  merge bzr.dev
removed:
  index.txt                      index.txt-20071121073725-0corxykv5irjal00-1
added:
  bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
  doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
  tools/package_mf.py            package_mf.py-20080206141953-323gd0qb2z3tn5pc-1
modified:
  .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/cmd_version_info.py     __init__.py-20051228204928-697d01fdca29c99b
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
  bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
  bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
  bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
  bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
  bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
  bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
  bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
  bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/smart/bzrdir.py         bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
  bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
  bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
  bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
  bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
  bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
  bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
  bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
  bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
  bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
  bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
  bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
  bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
  bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
  bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
  bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
  bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
  bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
  bzrlib/util/configobj/docs/BSD-LICENSE.txt BSDLICENSE.txt-20051018184548-29b89ff3102657f5
  bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
  bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
  bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
  doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
  doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
  tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
    ------------------------------------------------------------
    revno: 3193.1.53
    revision-id:pqm at pqm.ubuntu.com-20080229011300-p50it0si2y8mbv0d
    parent: pqm at pqm.ubuntu.com-20080228234130-5rw39g7z5ky3rdiw
    parent: bialix at ukr.net-20080228212744-fsj9dxk0ken018y6
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-02-29 01:13:00 +0000
    message:
      (James Westby) Make version-info --custom imply --all. (#195560)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/cmd_version_info.py     __init__.py-20051228204928-697d01fdca29c99b
      bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
        ------------------------------------------------------------
        revno: 3193.49.3
        revision-id:bialix at ukr.net-20080228212744-fsj9dxk0ken018y6
        parent: bialix at ukr.net-20080228212530-pcrt1sc4vcezapgr
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: bug.195560
        timestamp: Thu 2008-02-28 23:27:44 +0200
        message:
          update NEWS about fix for bug #195560
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3193.49.2
        revision-id:bialix at ukr.net-20080228212530-pcrt1sc4vcezapgr
        parent: jw+debian at jameswestby.net-20080225234106-9b4ql42w13ijewp3
        parent: pqm at pqm.ubuntu.com-20080228195416-virz04ciql01hw4y
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: bug.195560
        timestamp: Thu 2008-02-28 23:25:30 +0200
        message:
          merge bzr.dev
        added:
          bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
          bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
          bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
          bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
          bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
          bzrlib/util/configobj/docs/BSD-LICENSE.txt BSDLICENSE.txt-20051018184548-29b89ff3102657f5
          bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
          bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
          doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
        ------------------------------------------------------------
        revno: 3193.49.1
        revision-id:jw+debian at jameswestby.net-20080225234106-9b4ql42w13ijewp3
        parent: pqm at pqm.ubuntu.com-20080223141021-zgxlzjmg5c0hym5n
        committer: James Westby <jw+debian at jameswestby.net>
        branch nick: bzr.dev
        timestamp: Mon 2008-02-25 23:41:06 +0000
        message:
          Make version-info --custom imply --all.
          
          When using a custom template you can use variables like {clean} which
          are not enabled by default. This causes an ugly traceback.
          
          This fixes the issue by implying --all when --custom (or more exactly
          --template) is used, so that all variables are available in templates.
          
          This was the easier fix than having the template code report that the
          user should pass --check-clean to have {clean} available, but will
          have a performance impact on all users of version-info --custom,
          regardless of whether they use {clean}.
        modified:
          bzrlib/cmd_version_info.py     __init__.py-20051228204928-697d01fdca29c99b
          bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
    ------------------------------------------------------------
    revno: 3193.1.52
    revision-id:pqm at pqm.ubuntu.com-20080228234130-5rw39g7z5ky3rdiw
    parent: pqm at pqm.ubuntu.com-20080228221007-0r6qkug2m0np2s31
    parent: jw+debian at jameswestby.net-20080226211826-66qjm5w90o2pa527
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-02-28 23:41:30 +0000
    message:
      (Wesley J. Landaker) Add some more text to the --rio option help
       in version-info.
    modified:
      bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
        ------------------------------------------------------------
        revno: 3193.48.1
        revision-id:jw+debian at jameswestby.net-20080226211826-66qjm5w90o2pa527
        parent: pqm at pqm.ubuntu.com-20080223141021-zgxlzjmg5c0hym5n
        author: Wesley J. Landaker <wjl at icecavern.net>
        committer: James Westby <jw+debian at jameswestby.net>
        branch nick: bzr.dev
        timestamp: Tue 2008-02-26 21:18:26 +0000
        message:
          Add some more text to the --rio option help in version-info.
          
          This text gives a clue about what RIO format is, and also notes that
          it is the default.
        modified:
          bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
    ------------------------------------------------------------
    revno: 3193.1.51
    revision-id:pqm at pqm.ubuntu.com-20080228221007-0r6qkug2m0np2s31
    parent: pqm at pqm.ubuntu.com-20080228195416-virz04ciql01hw4y
    parent: michael.hudson at canonical.com-20080226234535-8nsggshqg9jelwpl
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-02-28 22:10:07 +0000
    message:
      (Michael Hudson) clean up option.py and branch.py imports
    modified:
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
        ------------------------------------------------------------
        revno: 3193.47.2
        revision-id:michael.hudson at canonical.com-20080226234535-8nsggshqg9jelwpl
        parent: michael.hudson at canonical.com-20080226234524-dkb3xnwnaj912yco
        committer: Michael Hudson <michael.hudson at canonical.com>
        branch nick: remove-pointless-lazy-imports
        timestamp: Wed 2008-02-27 12:45:35 +1300
        message:
          clean up branch.py imports
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
        ------------------------------------------------------------
        revno: 3193.47.1
        revision-id:michael.hudson at canonical.com-20080226234524-dkb3xnwnaj912yco
        parent: pqm at pqm.ubuntu.com-20080225092119-bk1won32t9nw4h6u
        committer: Michael Hudson <michael.hudson at canonical.com>
        branch nick: remove-pointless-lazy-imports
        timestamp: Wed 2008-02-27 12:45:24 +1300
        message:
          clean up option.py imports
        modified:
          bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
    ------------------------------------------------------------
    revno: 3193.1.50
    revision-id:pqm at pqm.ubuntu.com-20080228195416-virz04ciql01hw4y
    parent: pqm at pqm.ubuntu.com-20080228181740-9luays3sm3jouxbj
    parent: robertc at robertcollins.net-20080228163138-79rgg8thdml9l2zd
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-02-28 19:54:16 +0000
    message:
      Fix branch implementation tests for rich-root repository using
      	branches (Robert Collins)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
        ------------------------------------------------------------
        revno: 3193.46.3
        revision-id:robertc at robertcollins.net-20080228163138-79rgg8thdml9l2zd
        parent: robertc at robertcollins.net-20080227022115-cmtkxjtvcp9qjn3r
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: fix-branch-subtree-tests
        timestamp: Fri 2008-02-29 03:31:38 +1100
        message:
          NEWS update per review.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3193.46.2
        revision-id:robertc at robertcollins.net-20080227022115-cmtkxjtvcp9qjn3r
        parent: robertc at robertcollins.net-20080225013831-0gsynkihg2bk066a
        parent: robertc at robertcollins.net-20080227021652-slx6hpps33pf1u61
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: fix-branch-subtree-tests
        timestamp: Wed 2008-02-27 13:21:15 +1100
        message:
          Merge bzr.dev.
        removed:
          index.txt                      index.txt-20071121073725-0corxykv5irjal00-1
        added:
          bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
          tools/package_mf.py            package_mf.py-20080206141953-323gd0qb2z3tn5pc-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
          bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
          bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
          bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
          bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3193.46.1
        revision-id:robertc at robertcollins.net-20080225013831-0gsynkihg2bk066a
        parent: robertc at robertcollins.net-20080222044646-uq0datkkxj96d24d
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: fix-branch-subtree-tests
        timestamp: Mon 2008-02-25 12:38:31 +1100
        message:
           * The branch interface tests were invalid for branches using subtree
             repositories by default. This has been fixed. (Robert Collins)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
    ------------------------------------------------------------
    revno: 3193.1.49
    revision-id:pqm at pqm.ubuntu.com-20080228181740-9luays3sm3jouxbj
    parent: pqm at pqm.ubuntu.com-20080228032258-4mdmqlx603ak6x2w
    parent: robertc at robertcollins.net-20080227021652-slx6hpps33pf1u61
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-02-28 18:17:40 +0000
    message:
      Remove cruft left in RemoteRepository - supports_external_lookips is
      	a format attribute. (Robert Collins)
    modified:
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
        ------------------------------------------------------------
        revno: 3193.45.2
        revision-id:robertc at robertcollins.net-20080227021652-slx6hpps33pf1u61
        parent: robertc at robertcollins.net-20080222044646-uq0datkkxj96d24d
        parent: pqm at pqm.ubuntu.com-20080225092119-bk1won32t9nw4h6u
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: remove Repository.supports_external_lookups
        timestamp: Wed 2008-02-27 13:16:52 +1100
        message:
          Merge bzr.dev.
        removed:
          index.txt                      index.txt-20071121073725-0corxykv5irjal00-1
        added:
          bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
          tools/package_mf.py            package_mf.py-20080206141953-323gd0qb2z3tn5pc-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
          bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
          bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
          bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
          bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3193.45.1
        revision-id:robertc at robertcollins.net-20080222044646-uq0datkkxj96d24d
        parent: pqm at pqm.ubuntu.com-20080220014008-9appc9kw4rjg8v1k
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: remove Repository.supports_external_lookups
        timestamp: Fri 2008-02-22 15:46:46 +1100
        message:
          Remove cruft left in RemoteRepository - supports_external_lookips is a format attribute.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
    ------------------------------------------------------------
    revno: 3193.1.48
    revision-id:pqm at pqm.ubuntu.com-20080228032258-4mdmqlx603ak6x2w
    parent: pqm at pqm.ubuntu.com-20080227213154-a7egrkiapeuvmu3b
    parent: aaron at aaronbentley.com-20080228013841-5j4n9784mc4fpeim
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-02-28 03:22:58 +0000
    message:
      Implement checkout entirely via dirstate (abentley)
    modified:
      bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
      bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
      bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
      bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
      bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
      bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3146.8.20
        revision-id:aaron at aaronbentley.com-20080228013841-5j4n9784mc4fpeim
        parent: aaron at aaronbentley.com-20080228013335-a6izyivlpd7ht72z
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: no-inventory5
        timestamp: Wed 2008-02-27 20:38:41 -0500
        message:
          Fix trailing whitespace
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3146.8.19
        revision-id:aaron at aaronbentley.com-20080228013335-a6izyivlpd7ht72z
        parent: aaron at aaronbentley.com-20080228003628-pjxtmj4qxibbnt8e
        parent: pqm at pqm.ubuntu.com-20080227213154-a7egrkiapeuvmu3b
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: no-inventory5
        timestamp: Wed 2008-02-27 20:33:35 -0500
        message:
          Merge with bzr.dev
        removed:
          bzrlib/plugins/multiparent.py  mpregen-20070411063203-5x9z7i73add0d6f6-1
          index.txt                      index.txt-20071121073725-0corxykv5irjal00-1
        added:
          bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
          doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
          tools/package_mf.py            package_mf.py-20080206141953-323gd0qb2z3tn5pc-1
        modified:
          .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/commands.py      __init__.py-20050617152058-1b6530d9ab85c11c
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
          bzrlib/plugins/launchpad/lp_indirect.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
          bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
          bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
          bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/smart/bzrdir.py         bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
          bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
          bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
          bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
          bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
          bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_nonascii.py  testnonascii.py-20051018022645-ea1d8b6477b058a6
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
          bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
          bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
          bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
          bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
          bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
          bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
          bzrlib/util/configobj/docs/BSD-LICENSE.txt BSDLICENSE.txt-20051018184548-29b89ff3102657f5
          bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
          bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
          bzrlib/version_info_formats/format_custom.py format_custom.py-20071029100350-ajovqhbpb5khf6gu-1
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
          doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3146.8.18
        revision-id:aaron at aaronbentley.com-20080228003628-pjxtmj4qxibbnt8e
        parent: aaron at aaronbentley.com-20080227235013-4wrfby3mq2pfeg8e
        parent: pqm at pqm.ubuntu.com-20080125195940-iwy2onaiiges6k4t
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: no-inventory5
        timestamp: Wed 2008-02-27 19:36:28 -0500
        message:
          Merge with dev
        added:
          bzrlib/tests/repository_implementations/test_has_revisions.py test_has_revisions.p-20080111035443-xaupgdsx5fw1q54b-1
          bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
          contrib/bzr_access             bzr_access-20071210163004-c9lb1renhra2ncg0-1
          doc/developers/inventory.txt   inventory.txt-20080103013957-opkrhxy6lmywmx4i-1
          doc/developers/lca-merge.txt   lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
          doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
          doc/en/user-guide/revnos.txt   revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
        renamed:
          bzrlib/tests/HTTPTestUtil.py => bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
          bzrlib/tests/HttpServer.py => bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          README                         README-20050309040720-8f368abf9f346b9d
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/bugtracker.py           bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/doc/api/__init__.py     __init__.py-20051224020744-7b87d590843855bc
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/help_topics/en/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/reconfigure.py          reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/smart/vfs.py            vfs.py-20061108095550-gunadhxmzkdjfeek-2
          bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/TestUtil.py       TestUtil.py-20050824080200-5f70140a2d938694
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
          bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
          bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
          bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
          bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/branch_implementations/test_http.py test_http.py-20060731224648-2eef7ae5yja95rya-1
          bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
          bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
          bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
          bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
          bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_revert.py    test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_tsort.py     testtsort.py-20051025073946-27da871c394d5be4
          bzrlib/tests/test_urlutils.py  test_urlutils.py-20060502192900-46b1f9579987cf9c
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
          bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/tsort.py                tsort.py-20051025073946-7808f6aaf7d07208
          bzrlib/urlutils.py             urlutils.py-20060502195429-e8a161ecf8fac004
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
          doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
          doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
          doc/en/user-guide/index.txt    index.txt-20060622101119-tgwtdci8z769bjb9-2
          doc/index.txt                  index.txt-20070813101924-07gd9i9d2jt124bf-1
          tools/rst2html.py              rst2html.py-20060817120932-gn177u8v0008txhu-1
          bzrlib/tests/http_utils.py     HTTPTestUtil.py-20050914180604-247d3aafb7a43343
          bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
        ------------------------------------------------------------
        revno: 3146.8.17
        revision-id:aaron at aaronbentley.com-20080227235013-4wrfby3mq2pfeg8e
        parent: abentley at panoramicfeedback.com-20080103221440-0y6atamnscjnoh9s
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: no-inventory5
        timestamp: Wed 2008-02-27 18:50:13 -0500
        message:
          Change to explicit file_id list
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3146.8.16
        revision-id:abentley at panoramicfeedback.com-20080103221440-0y6atamnscjnoh9s
        parent: aaron.bentley at utoronto.ca-20071231203605-2kp31tw9k4ui5sgw
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: no-inventory5
        timestamp: Thu 2008-01-03 17:14:40 -0500
        message:
          Updates from review
        modified:
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3146.8.15
        revision-id:aaron.bentley at utoronto.ca-20071231203605-2kp31tw9k4ui5sgw
        parent: aaron.bentley at utoronto.ca-20071231202953-06fukpgs3zzlssxa
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory5
        timestamp: Mon 2007-12-31 15:36:05 -0500
        message:
          Cleanup and docs
        modified:
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3146.8.14
        revision-id:aaron.bentley at utoronto.ca-20071231202953-06fukpgs3zzlssxa
        parent: aaron.bentley at utoronto.ca-20071231202858-ha1jk5qyafv7jg2k
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory5
        timestamp: Mon 2007-12-31 15:29:53 -0500
        message:
          Remove unused var
        modified:
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
        ------------------------------------------------------------
        revno: 3146.8.13
        revision-id:aaron.bentley at utoronto.ca-20071231202858-ha1jk5qyafv7jg2k
        parent: aaron.bentley at utoronto.ca-20071231202212-r0q3n2kxb0tvdwyq
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory5
        timestamp: Mon 2007-12-31 15:28:58 -0500
        message:
          Clean up code
        modified:
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
        ------------------------------------------------------------
        revno: 3146.8.12
        revision-id:aaron.bentley at utoronto.ca-20071231202212-r0q3n2kxb0tvdwyq
        parent: aaron.bentley at utoronto.ca-20071231194738-2ucz6alk4jxd4e96
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory5
        timestamp: Mon 2007-12-31 15:22:12 -0500
        message:
          Add a flush to rename_one
        modified:
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3146.8.11
        revision-id:aaron.bentley at utoronto.ca-20071231194738-2ucz6alk4jxd4e96
        parent: aaron.bentley at utoronto.ca-20071231192011-t0aj8nilc0t2eio7
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory5
        timestamp: Mon 2007-12-31 14:47:38 -0500
        message:
          Fix dirstate/inventory dance, mark dirstate modified and in memory
        modified:
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3146.8.10
        revision-id:aaron.bentley at utoronto.ca-20071231192011-t0aj8nilc0t2eio7
        parent: aaron.bentley at utoronto.ca-20071231191758-ms44mbfdvym8nomi
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory5
        timestamp: Mon 2007-12-31 14:20:11 -0500
        message:
          Clean up some variable names
        modified:
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
        ------------------------------------------------------------
        revno: 3146.8.9
        revision-id:aaron.bentley at utoronto.ca-20071231191758-ms44mbfdvym8nomi
        parent: aaron.bentley at utoronto.ca-20071231191334-7qxwlt6tk7ds9ugi
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory5
        timestamp: Mon 2007-12-31 14:17:58 -0500
        message:
          Fix child execute bit
        modified:
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
        ------------------------------------------------------------
        revno: 3146.8.8
        revision-id:aaron.bentley at utoronto.ca-20071231191334-7qxwlt6tk7ds9ugi
        parent: aaron.bentley at utoronto.ca-20071231191251-git7fbe9mm2um9gr
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory5
        timestamp: Mon 2007-12-31 14:13:34 -0500
        message:
          Remove debug code
        modified:
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
        ------------------------------------------------------------
        revno: 3146.8.7
        revision-id:aaron.bentley at utoronto.ca-20071231191251-git7fbe9mm2um9gr
        parent: aaron.bentley at utoronto.ca-20071231180920-3fqtecnwuww69tzy
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory5
        timestamp: Mon 2007-12-31 14:12:51 -0500
        message:
          Remove unused code
        modified:
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
        ------------------------------------------------------------
        revno: 3146.8.6
        revision-id:aaron.bentley at utoronto.ca-20071231180920-3fqtecnwuww69tzy
        parent: aaron.bentley at utoronto.ca-20071231161005-3l7s9521wm9zbjxg
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory5
        timestamp: Mon 2007-12-31 13:09:20 -0500
        message:
          Get apply_inventory_delta almost working properly
        modified:
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3146.8.5
        revision-id:aaron.bentley at utoronto.ca-20071231161005-3l7s9521wm9zbjxg
        parent: aaron.bentley at utoronto.ca-20071231053539-lpxc6wewg2r17bd9
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory5
        timestamp: Mon 2007-12-31 11:10:05 -0500
        message:
          Get apply_inventory_delta kinda working, but not children
        modified:
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3146.8.4
        revision-id:aaron.bentley at utoronto.ca-20071231053539-lpxc6wewg2r17bd9
        parent: aaron.bentley at utoronto.ca-20071230222732-j9b28xdzcksa7e7e
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory5
        timestamp: Mon 2007-12-31 00:35:39 -0500
        message:
          Eliminate direct use of inventory from transform application
        modified:
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3146.8.3
        revision-id:aaron.bentley at utoronto.ca-20071230222732-j9b28xdzcksa7e7e
        parent: aaron.bentley at utoronto.ca-20071230222401-mopeude5ha916n1h
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory5
        timestamp: Sun 2007-12-30 17:27:32 -0500
        message:
          Avoid inventory in TT._apply_removals
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3146.8.2
        revision-id:aaron.bentley at utoronto.ca-20071230222401-mopeude5ha916n1h
        parent: aaron.bentley at utoronto.ca-20071230213111-wlv22dbxj7xm9rl2
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory5
        timestamp: Sun 2007-12-30 17:24:01 -0500
        message:
          Introduce iter_all_file_ids, to avoid hitting Inventory for this case
        modified:
          bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
          bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3146.8.1
        revision-id:aaron.bentley at utoronto.ca-20071230213111-wlv22dbxj7xm9rl2
        parent: pqm at pqm.ubuntu.com-20071228175832-9kboqtkemnuzzlab
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory5
        timestamp: Sun 2007-12-30 16:31:11 -0500
        message:
          Fix two tree.inventory uses in checkout
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
    ------------------------------------------------------------
    revno: 3193.1.47
    revision-id:pqm at pqm.ubuntu.com-20080227213154-a7egrkiapeuvmu3b
    parent: pqm at pqm.ubuntu.com-20080227195331-0nc0vzgjka1ornoe
    parent: john at arbash-meinel.com-20080227164153-gtx6hncy32u8oa2v
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-02-27 21:31:54 +0000
    message:
      (jam) wrap bazaar_workflows.txt to 79 chars
    modified:
      doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
        ------------------------------------------------------------
        revno: 3193.43.2
        revision-id:john at arbash-meinel.com-20080227164153-gtx6hncy32u8oa2v
        parent: john at arbash-meinel.com-20080227161929-vpcyxi0v7ei24sqg
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2008-02-27 10:41:53 -0600
        message:
          wrap doc/en/user-guide/bazaar_workflows.txt for 79 characters
        modified:
          doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
    ------------------------------------------------------------
    revno: 3193.1.46
    revision-id:pqm at pqm.ubuntu.com-20080227195331-0nc0vzgjka1ornoe
    parent: pqm at pqm.ubuntu.com-20080227181337-obp6vadq9d34z220
    parent: mnordhoff at mattnordhoff.com-20080227071226-q8rwfacp8oez2xu4
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-02-27 19:53:31 +0000
    message:
      Convert hasattr to getatter in ConfigObj (mnordhoff)
    modified:
      bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
        ------------------------------------------------------------
        revno: 3193.44.1
        revision-id:mnordhoff at mattnordhoff.com-20080227071226-q8rwfacp8oez2xu4
        parent: mnordhoff at mattnordhoff.com-20080219185424-skmms84cwj5abvqi
        committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
        branch nick: configobj-4.5.1
        timestamp: Wed 2008-02-27 07:12:26 +0000
        message:
          Use getattr instead of hasattr everywhere else in the file...
        modified:
          bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
    ------------------------------------------------------------
    revno: 3193.1.45
    revision-id:pqm at pqm.ubuntu.com-20080227181337-obp6vadq9d34z220
    parent: pqm at pqm.ubuntu.com-20080227060052-pq0rxy2q8r25f08e
    parent: john at arbash-meinel.com-20080227161929-vpcyxi0v7ei24sqg
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-02-27 18:13:37 +0000
    message:
      (Neil Martinsen-Burrell) doc cleanups
    modified:
      doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
      doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
        ------------------------------------------------------------
        revno: 3193.43.1
        revision-id:john at arbash-meinel.com-20080227161929-vpcyxi0v7ei24sqg
        parent: pqm at pqm.ubuntu.com-20080227060052-pq0rxy2q8r25f08e
        parent: nmb at wartburg.edu-20080224025524-aeh6wuc2jnxloykf
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2008-02-27 10:19:29 -0600
        message:
          merge doc changes
        modified:
          doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
          doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
        ------------------------------------------------------------
        revno: 3193.42.1
        revision-id:nmb at wartburg.edu-20080224025524-aeh6wuc2jnxloykf
        parent: pqm at pqm.ubuntu.com-20080224013817-4ps9nmrzjtg9ugtz
        committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
        branch nick: minor-user-guide-changes
        timestamp: Sat 2008-02-23 20:55:24 -0600
        message:
          minor doc changes
        modified:
          doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
          doc/en/user-guide/branching_a_project.txt branching_a_project.-20071122141511-0knao2lklsdsvb1q-2
    ------------------------------------------------------------
    revno: 3193.1.44
    revision-id:pqm at pqm.ubuntu.com-20080227060052-pq0rxy2q8r25f08e
    parent: pqm at pqm.ubuntu.com-20080225092119-bk1won32t9nw4h6u
    parent: aaron at aaronbentley.com-20080227041411-98x9n32r8ae0drn0
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-02-27 06:00:52 +0000
    message:
      Update bundled ConfigObj to 4.5.1 (mnordhoff)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
      bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
      bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
      bzrlib/util/configobj/docs/BSD-LICENSE.txt BSDLICENSE.txt-20051018184548-29b89ff3102657f5
      bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
      bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
        ------------------------------------------------------------
        revno: 3193.41.8
        revision-id:aaron at aaronbentley.com-20080227041411-98x9n32r8ae0drn0
        parent: mnordhoff at mattnordhoff.com-20080219185424-skmms84cwj5abvqi
        parent: pqm at pqm.ubuntu.com-20080225092119-bk1won32t9nw4h6u
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: bzr.ab.integration
        timestamp: Tue 2008-02-26 23:14:11 -0500
        message:
          Merge with bzr.dev
        removed:
          index.txt                      index.txt-20071121073725-0corxykv5irjal00-1
        added:
          bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
          doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
          tools/package_mf.py            package_mf.py-20080206141953-323gd0qb2z3tn5pc-1
        modified:
          .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
          bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/smart/bzrdir.py         bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
          bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
          bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
          bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
          bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3193.41.7
        revision-id:mnordhoff at mattnordhoff.com-20080219185424-skmms84cwj5abvqi
        parent: mnordhoff at mattnordhoff.com-20080214103644-h5u196t4gzavgfsa
        committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
        branch nick: configobj-4.5.1
        timestamp: Tue 2008-02-19 18:54:24 +0000
        message:
          Use getattr instead of hasattr.
        modified:
          bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
        ------------------------------------------------------------
        revno: 3193.41.6
        revision-id:mnordhoff at mattnordhoff.com-20080214103644-h5u196t4gzavgfsa
        parent: mnordhoff at mattnordhoff.com-20080214103554-tiwixd3wxal1ytde
        committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
        branch nick: configobj-4.5.1
        timestamp: Thu 2008-02-14 10:36:44 +0000
        message:
          Move NEWS entry from 1.2rc1 section to "in development".
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3193.41.5
        revision-id:mnordhoff at mattnordhoff.com-20080214103554-tiwixd3wxal1ytde
        parent: mnordhoff at mattnordhoff.com-20080211232734-l0g8pxt5gjf9h2c6
        parent: pqm at pqm.ubuntu.com-20080213045747-hqu3aghke3zn12b7
        committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
        branch nick: configobj-4.5.1
        timestamp: Thu 2008-02-14 10:35:54 +0000
        message:
          Merge bzr.dev for development cycle NEWS update.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/bundle/commands.py      __init__.py-20050617152058-1b6530d9ab85c11c
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
          bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3193.41.4
        revision-id:mnordhoff at mattnordhoff.com-20080211232734-l0g8pxt5gjf9h2c6
        parent: mnordhoff at mattnordhoff.com-20080211224913-1pyp639l7hb2gtmj
        committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
        branch nick: configobj-4.5.1
        timestamp: Mon 2008-02-11 23:27:34 +0000
        message:
          Add test for bug #86838.
        modified:
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
        ------------------------------------------------------------
        revno: 3193.41.3
        revision-id:mnordhoff at mattnordhoff.com-20080211224913-1pyp639l7hb2gtmj
        parent: mnordhoff at mattnordhoff.com-20080211073105-8hrr39fpoco4unn9
        committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
        branch nick: configobj-4.5.1
        timestamp: Mon 2008-02-11 22:49:13 +0000
        message:
          Tweak NEWS.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3193.41.2
        revision-id:mnordhoff at mattnordhoff.com-20080211073105-8hrr39fpoco4unn9
        parent: mnordhoff at mattnordhoff.com-20080208190945-b4lai3ufhtt41wth
        committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
        branch nick: configobj-4.5.1
        timestamp: Mon 2008-02-11 07:31:05 +0000
        message:
          Update NEWS, mentioing bug #86838.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3193.41.1
        revision-id:mnordhoff at mattnordhoff.com-20080208190945-b4lai3ufhtt41wth
        parent: pqm at pqm.ubuntu.com-20080208064756-bg0zu0y4e789j50r
        committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
        branch nick: configobj-4.5.1
        timestamp: Fri 2008-02-08 19:09:45 +0000
        message:
          Upgrade ConfigObj to version 4.5.1.
          
          A couple of tests had to be updated because ConfigObj now makes sure all files end in a line terminator.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
          bzrlib/util/configobj/docs/BSD-LICENSE.txt BSDLICENSE.txt-20051018184548-29b89ff3102657f5
          bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
          bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
    ------------------------------------------------------------
    revno: 3193.1.43
    revision-id:pqm at pqm.ubuntu.com-20080225092119-bk1won32t9nw4h6u
    parent: pqm at pqm.ubuntu.com-20080224191521-mrdhiyn59r5q2z6l
    parent: mbp at sourcefrog.net-20080225072829-3cmqkr9rf19mm0sg
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2008-02-25 09:21:19 +0000
    message:
      Merge 1.2 branch
    added:
      bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
      bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
      bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
        ------------------------------------------------------------
        revno: 3193.40.1
        revision-id:mbp at sourcefrog.net-20080225072829-3cmqkr9rf19mm0sg
        parent: pqm at pqm.ubuntu.com-20080224191521-mrdhiyn59r5q2z6l
        parent: pqm at pqm.ubuntu.com-20080215084056-2vb2i797v2pkp0ih
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: integration
        timestamp: Mon 2008-02-25 18:28:29 +1100
        message:
          Merge 1.2 branch
        added:
          bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
          bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
        ------------------------------------------------------------
        revno: 3193.39.2
        revision-id:pqm at pqm.ubuntu.com-20080215084056-2vb2i797v2pkp0ih
        parent: pqm at pqm.ubuntu.com-20080215062156-x6i1rw2dy7xd9rk2
        parent: mbp at sourcefrog.net-20080215071023-hg96fkd6hnoi6j3b
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: 1.2
        timestamp: Fri 2008-02-15 08:40:56 +0000
        message:
          prepare 1.2 final
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
            ------------------------------------------------------------
            revno: 3193.27.13
            revision-id:mbp at sourcefrog.net-20080215071023-hg96fkd6hnoi6j3b
            parent: mbp at sourcefrog.net-20080215044019-okgf247i7nlj71tv
            committer: Martin Pool <mbp at sourcefrog.net>
            branch nick: prepare-1.2
            timestamp: Fri 2008-02-15 18:10:23 +1100
            message:
              Release 1.2 final
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
        ------------------------------------------------------------
        revno: 3193.39.1
        revision-id:pqm at pqm.ubuntu.com-20080215062156-x6i1rw2dy7xd9rk2
        parent: pqm at pqm.ubuntu.com-20080208064756-bg0zu0y4e789j50r
        parent: mbp at sourcefrog.net-20080215044019-okgf247i7nlj71tv
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: 1.2
        timestamp: Fri 2008-02-15 06:21:56 +0000
        message:
          integrated changes for 1.2r1 release
        added:
          bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/commands.py      __init__.py-20050617152058-1b6530d9ab85c11c
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
          bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
          bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3193.27.12
        revision-id:mbp at sourcefrog.net-20080215044019-okgf247i7nlj71tv
        parent: mbp at sourcefrog.net-20080213082208-ewzg938ayzjfs1gw
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: prepare-1.2rc1
        timestamp: Fri 2008-02-15 15:40:19 +1100
        message:
          Update Launchpad indirection tests to allow for xmlrpcs being sent to edge by default
        modified:
          bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
        ------------------------------------------------------------
        revno: 3193.27.11
        revision-id:mbp at sourcefrog.net-20080213082208-ewzg938ayzjfs1gw
        parent: mbp at sourcefrog.net-20080213075723-8j651ka0iiipjfbq
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: prepare-1.2rc1
        timestamp: Wed 2008-02-13 19:22:08 +1100
        message:
          Release 1.2rc1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
        ------------------------------------------------------------
        revno: 3193.27.10
        revision-id:mbp at sourcefrog.net-20080213075723-8j651ka0iiipjfbq
        parent: mbp at sourcefrog.net-20080213075259-an2y8ya0j2z4o077
        parent: v.ladeuil+lp at free.fr-20080210155122-gib8voz2xbausm5c
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: prepare-1.2rc1
        timestamp: Wed 2008-02-13 18:57:23 +1100
        message:
          [\#137832] raise UnavailableFeature from inside tests, not from setup
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
            ------------------------------------------------------------
            revno: 3193.38.1
            revision-id:v.ladeuil+lp at free.fr-20080210155122-gib8voz2xbausm5c
            parent: pqm at pqm.ubuntu.com-20080208064756-bg0zu0y4e789j50r
            committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
            branch nick: 137823-selftest-broken-osx
            timestamp: Sun 2008-02-10 16:51:22 +0100
            message:
              Fix bug #137823 by raising UnavailableFeature *after* the fake ftp server
              setup is completed.
              
              *  bzrlib/transport/ftp.py:
              (get_test_permutations.UnavailableFTPServer): Raising an exception
              during setup is not correctly handled by the test
              framework. Better raise it on get_url() and get_bogus_url() which
              are always called first when using a server.
              
              *  bzrlib/builtins.py:
              (cmd_selftest.run): 'info()' is about to be deprecated, use note()
              instead.
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
              bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
              bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
        ------------------------------------------------------------
        revno: 3193.27.9
        revision-id:mbp at sourcefrog.net-20080213075259-an2y8ya0j2z4o077
        parent: mbp at sourcefrog.net-20080213014247-buajf9y91w5xuaa8
        parent: mbp at sourcefrog.net-20080213064353-y03ge29mnhkktmtp
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: prepare-1.2rc1
        timestamp: Wed 2008-02-13 18:52:59 +1100
        message:
          Treat failure to load plugin test suites as a fatal error; fix Launchpad tests
        added:
          bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
        ------------------------------------------------------------
        revno: 3193.37.5
        revision-id:mbp at sourcefrog.net-20080213064353-y03ge29mnhkktmtp
        parent: mbp at sourcefrog.net-20080213035319-optr3exo2xw39atk
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: 189771_launchpad_tests
        timestamp: Wed 2008-02-13 17:43:53 +1100
        message:
          Tweak indents
        modified:
          bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
        ------------------------------------------------------------
        revno: 3193.37.4
        revision-id:mbp at sourcefrog.net-20080213035319-optr3exo2xw39atk
        parent: mbp at sourcefrog.net-20080213034940-a78z9vple6wa8kef
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: 189771_launchpad_tests
        timestamp: Wed 2008-02-13 14:53:19 +1100
        message:
          Add news item for #189771
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3193.37.3
        revision-id:mbp at sourcefrog.net-20080213034940-a78z9vple6wa8kef
        parent: mbp at sourcefrog.net-20080213034558-anhm9j1l3mbbmnyo
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: 189771_launchpad_tests
        timestamp: Wed 2008-02-13 14:49:40 +1100
        message:
          Fix news indents
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3193.37.2
        revision-id:mbp at sourcefrog.net-20080213034558-anhm9j1l3mbbmnyo
        parent: mbp at sourcefrog.net-20080213030249-5mspg3fydg8b3xg5
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: 189771_launchpad_tests
        timestamp: Wed 2008-02-13 14:45:58 +1100
        message:
          Add in thumpers tests for selection of the right Launchpad instance
        added:
          bzrlib/plugins/launchpad/test_lp_service.py test_lp_service.py-20080213034527-drf0ucr2x1js3onb-1
        modified:
          bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
        ------------------------------------------------------------
        revno: 3193.37.1
        revision-id:mbp at sourcefrog.net-20080213030249-5mspg3fydg8b3xg5
        parent: pqm at pqm.ubuntu.com-20080208064756-bg0zu0y4e789j50r
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: 189771_launchpad_tests
        timestamp: Wed 2008-02-13 14:02:49 +1100
        message:
          Treat failure to load plugin test suites as a fatal error
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 3193.1.42
    revision-id:pqm at pqm.ubuntu.com-20080224191521-mrdhiyn59r5q2z6l
    parent: pqm at pqm.ubuntu.com-20080224013817-4ps9nmrzjtg9ugtz
    parent: aaron at aaronbentley.com-20080224174002-6lszpitwftf99byi
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2008-02-24 19:15:21 +0000
    message:
      Add hardlink support to checkout and branch (abentley)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
      bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
      bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
      bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
      bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
      bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3136.1.11
        revision-id:aaron at aaronbentley.com-20080224174002-6lszpitwftf99byi
        parent: aaron at aaronbentley.com-20080224171956-0qu73pf4pol2utu4
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: hardlinks2
        timestamp: Sun 2008-02-24 12:40:02 -0500
        message:
          Updates from review
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3136.1.10
        revision-id:aaron at aaronbentley.com-20080224171956-0qu73pf4pol2utu4
        parent: aaron at aaronbentley.com-20080224164446-inrognyno8lghkzz
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: hardlinks2
        timestamp: Sun 2008-02-24 12:19:56 -0500
        message:
          Clean error if filesystem does not support hard-links
        modified:
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3136.1.9
        revision-id:aaron at aaronbentley.com-20080224164446-inrognyno8lghkzz
        parent: aaron at aaronbentley.com-20080224164213-eza1lzru5bwuwmmj
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: hardlinks2
        timestamp: Sun 2008-02-24 11:44:46 -0500
        message:
          Move NEWS entry
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3136.1.8
        revision-id:aaron at aaronbentley.com-20080224164213-eza1lzru5bwuwmmj
        parent: abentley at panoramicfeedback.com-20071221153251-prgilpbjkdif3265
        parent: pqm at pqm.ubuntu.com-20080224013817-4ps9nmrzjtg9ugtz
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: hardlinks2
        timestamp: Sun 2008-02-24 11:42:13 -0500
        message:
          Merge with bzr.dev
        removed:
          bzrlib/plugins/multiparent.py  mpregen-20070411063203-5x9z7i73add0d6f6-1
          index.txt                      index.txt-20071121073725-0corxykv5irjal00-1
        added:
          bzrlib/tests/repository_implementations/test_has_revisions.py test_has_revisions.p-20080111035443-xaupgdsx5fw1q54b-1
          bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
          contrib/bzr_access             bzr_access-20071210163004-c9lb1renhra2ncg0-1
          doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
          doc/developers/inventory.txt   inventory.txt-20080103013957-opkrhxy6lmywmx4i-1
          doc/developers/lca-merge.txt   lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
          doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
          doc/en/user-guide/revnos.txt   revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
          tools/package_mf.py            package_mf.py-20080206141953-323gd0qb2z3tn5pc-1
        renamed:
          bzrlib/tests/HTTPTestUtil.py => bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
          bzrlib/tests/HttpServer.py => bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
        modified:
          .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          README                         README-20050309040720-8f368abf9f346b9d
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/bugtracker.py           bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/commands.py      __init__.py-20050617152058-1b6530d9ab85c11c
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
          bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/doc/api/__init__.py     __init__.py-20051224020744-7b87d590843855bc
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/help_topics/en/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
          bzrlib/plugins/launchpad/lp_indirect.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
          bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
          bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
          bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/reconfigure.py          reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
          bzrlib/smart/bzrdir.py         bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/smart/vfs.py            vfs.py-20061108095550-gunadhxmzkdjfeek-2
          bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
          bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/TestUtil.py       TestUtil.py-20050824080200-5f70140a2d938694
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
          bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
          bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
          bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
          bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
          bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
          bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
          bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
          bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/branch_implementations/test_http.py test_http.py-20060731224648-2eef7ae5yja95rya-1
          bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
          bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
          bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
          bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
          bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
          bzrlib/tests/test_nonascii.py  testnonascii.py-20051018022645-ea1d8b6477b058a6
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
          bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_revert.py    test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
          bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_tsort.py     testtsort.py-20051025073946-27da871c394d5be4
          bzrlib/tests/test_urlutils.py  test_urlutils.py-20060502192900-46b1f9579987cf9c
          bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
          bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
          bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
          bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
          bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/tsort.py                tsort.py-20051025073946-7808f6aaf7d07208
          bzrlib/urlutils.py             urlutils.py-20060502195429-e8a161ecf8fac004
          bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
          bzrlib/version_info_formats/format_custom.py format_custom.py-20071029100350-ajovqhbpb5khf6gu-1
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
          doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
          doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
          doc/en/user-guide/index.txt    index.txt-20060622101119-tgwtdci8z769bjb9-2
          doc/index.txt                  index.txt-20070813101924-07gd9i9d2jt124bf-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/rst2html.py              rst2html.py-20060817120932-gn177u8v0008txhu-1
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
          bzrlib/tests/http_utils.py     HTTPTestUtil.py-20050914180604-247d3aafb7a43343
          bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
        ------------------------------------------------------------
        revno: 3136.1.7
        revision-id:abentley at panoramicfeedback.com-20071221153251-prgilpbjkdif3265
        parent: aaron.bentley at utoronto.ca-20071221065648-so15wllqktbs8cp4
        parent: pqm at pqm.ubuntu.com-20071221145325-erktp9le86ik56j1
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: hardlinks2
        timestamp: Fri 2007-12-21 10:32:51 -0500
        message:
          Merge with bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3136.1.6
        revision-id:aaron.bentley at utoronto.ca-20071221065648-so15wllqktbs8cp4
        parent: abentley at panoramicfeedback.com-20071220211242-ofgviijwgtgivg90
        parent: aaron.bentley at utoronto.ca-20071221041231-q2l480o2twqvayj5
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: hardlinks2
        timestamp: Fri 2007-12-21 01:56:48 -0500
        message:
          Merge path-handling fix
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
        ------------------------------------------------------------
        revno: 3136.1.5
        revision-id:abentley at panoramicfeedback.com-20071220211242-ofgviijwgtgivg90
        parent: abentley at panoramicfeedback.com-20071220210219-bkf081e3t9ubkszq
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: hardlinks2
        timestamp: Thu 2007-12-20 16:12:42 -0500
        message:
          Fix sample workingtree format
        modified:
          bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
        ------------------------------------------------------------
        revno: 3136.1.4
        revision-id:abentley at panoramicfeedback.com-20071220210219-bkf081e3t9ubkszq
        parent: abentley at panoramicfeedback.com-20071220204445-9o2f10gvvd8e4rks
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: hardlinks2
        timestamp: Thu 2007-12-20 16:02:19 -0500
        message:
          Avoid id2abspath calls
        modified:
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3136.1.3
        revision-id:abentley at panoramicfeedback.com-20071220204445-9o2f10gvvd8e4rks
        parent: abentley at panoramicfeedback.com-20071220201922-r6a2vsx612x87yf6
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: hardlinks2
        timestamp: Thu 2007-12-20 15:44:45 -0500
        message:
          Implement hard-link support for branch and checkout
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
          bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3136.1.2
        revision-id:abentley at panoramicfeedback.com-20071220201922-r6a2vsx612x87yf6
        parent: abentley at panoramicfeedback.com-20071220191602-q1p5o3svshujfodd
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: hardlinks2
        timestamp: Thu 2007-12-20 15:19:22 -0500
        message:
          Implement hard-linking for build_tree
        modified:
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3136.1.1
        revision-id:abentley at panoramicfeedback.com-20071220191602-q1p5o3svshujfodd
        parent: pqm at pqm.ubuntu.com-20071220173454-9nqwgm3k66f4bmj8
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: hardlinks2
        timestamp: Thu 2007-12-20 14:16:02 -0500
        message:
          Add support for hardlinks to TreeTransform
        modified:
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
    ------------------------------------------------------------
    revno: 3193.1.41
    revision-id:pqm at pqm.ubuntu.com-20080224013817-4ps9nmrzjtg9ugtz
    parent: pqm at pqm.ubuntu.com-20080224000013-u7w012v4b2q8287b
    parent: james at jamesh.id.au-20080204093207-rny3wzjxli69ee3y
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2008-02-24 01:38:17 +0000
    message:
      (James Henstridge) Fix MemoryTransport._abspath() for relpath=''
       (bug #188855)
    modified:
      bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
      bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
        ------------------------------------------------------------
        revno: 3193.36.2
        revision-id:james at jamesh.id.au-20080204093207-rny3wzjxli69ee3y
        parent: james at jamesh.id.au-20080204092703-nu8kzumi57auimwv
        committer: James Henstridge <james at jamesh.id.au>
        branch nick: bzr.bug-188855
        timestamp: Mon 2008-02-04 18:32:07 +0900
        message:
          Remove unnecessary line break.
        modified:
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
        ------------------------------------------------------------
        revno: 3193.36.1
        revision-id:james at jamesh.id.au-20080204092703-nu8kzumi57auimwv
        parent: pqm at pqm.ubuntu.com-20080201053934-q32y2nk5vvo13c6v
        committer: James Henstridge <james at jamesh.id.au>
        branch nick: bzr.bug-188855
        timestamp: Mon 2008-02-04 18:27:03 +0900
        message:
          * Remove relpath='' special case in MemoryTransport._abspath(), which 
            gave incorrect results for cloned transports.
          * Add a Transport.list_dir() test for a cloned transport.
        modified:
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
    ------------------------------------------------------------
    revno: 3193.1.40
    revision-id:pqm at pqm.ubuntu.com-20080224000013-u7w012v4b2q8287b
    parent: pqm at pqm.ubuntu.com-20080223160808-81yb25z7tmhlss8q
    parent: dato at net.com.org.es-20071129184810-msdgijx9l9wi6w83
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2008-02-24 00:00:13 +0000
    message:
      (Adeodato Simo) bzr-svn does not use pack-0.92-subtree
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3051.1.1
        revision-id:dato at net.com.org.es-20071129184810-msdgijx9l9wi6w83
        parent: pqm at pqm.ubuntu.com-20071129180655-yv661adx0qb6a50z
        committer: Adeodato Simó <dato at net.com.org.es>
        branch nick: bzr.trivial
        timestamp: Thu 2007-11-29 19:48:10 +0100
        message:
          Remove note about bzr-svn using pack-0.92-subtree (it uses rich-root now).
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3193.1.39
    revision-id:pqm at pqm.ubuntu.com-20080223160808-81yb25z7tmhlss8q
    parent: pqm at pqm.ubuntu.com-20080223141021-zgxlzjmg5c0hym5n
    parent: bialix at ukr.net-20080223142450-7o36f9rf39mtz18z
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2008-02-23 16:08:08 +0000
    message:
      (Dmitry Vasiliev) Restore auto-detection of plink.exe on Windows
       (bug #107593)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
      bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
        ------------------------------------------------------------
        revno: 3193.35.5
        revision-id:bialix at ukr.net-20080223142450-7o36f9rf39mtz18z
        parent: bialix at ukr.net-20080223114033-1lfhefcm06fm62um
        parent: pqm at pqm.ubuntu.com-20080223141021-zgxlzjmg5c0hym5n
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: bug.107593
        timestamp: Sat 2008-02-23 16:24:50 +0200
        message:
          merge bzr.dev
        removed:
          index.txt                      index.txt-20071121073725-0corxykv5irjal00-1
        added:
          tools/package_mf.py            package_mf.py-20080206141953-323gd0qb2z3tn5pc-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3193.35.4
        revision-id:bialix at ukr.net-20080223114033-1lfhefcm06fm62um
        parent: bialix at ukr.net-20080223113207-2au125woovq0i8qh
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: bug.107593
        timestamp: Sat 2008-02-23 13:40:33 +0200
        message:
          NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3193.35.3
        revision-id:bialix at ukr.net-20080223113207-2au125woovq0i8qh
        parent: dima at hlabs.spb.ru-20080208183635-srbdry1dncrwmyh0
        parent: pqm at pqm.ubuntu.com-20080222065317-v0xvap07o35t0ymj
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: bug.107593
        timestamp: Sat 2008-02-23 13:32:07 +0200
        message:
          merge bzr.dev
        added:
          doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
        modified:
          .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/bundle/commands.py      __init__.py-20050617152058-1b6530d9ab85c11c
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/smart/bzrdir.py         bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
          bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3193.35.2
        revision-id:dima at hlabs.spb.ru-20080208183635-srbdry1dncrwmyh0
        parent: dima at hlabs.spb.ru-20080207182947-5d3kef191b1hs7ln
        committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
        branch nick: plink.fix
        timestamp: Fri 2008-02-08 16:36:35 -0200
        message:
          Re-enabled auto-detection of plink vendor and fixed tests
        modified:
          bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
          bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
        ------------------------------------------------------------
        revno: 3193.35.1
        revision-id:dima at hlabs.spb.ru-20080207182947-5d3kef191b1hs7ln
        parent: pqm at pqm.ubuntu.com-20080207065948-pjxwy4z6ljrpugj8
        committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
        branch nick: bzr.dev
        timestamp: Thu 2008-02-07 16:29:47 -0200
        message:
          Now plink closes the pipe if unable to open ssh connection and connection error can be reported
        modified:
          bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
    ------------------------------------------------------------
    revno: 3193.1.38
    revision-id:pqm at pqm.ubuntu.com-20080223141021-zgxlzjmg5c0hym5n
    parent: pqm at pqm.ubuntu.com-20080223121051-ntecw60563jadb3s
    parent: bialix at ukr.net-20080223122738-t0o7ks71xmfyr46t
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2008-02-23 14:10:21 +0000
    message:
      (bialix) bzr.exe: move builtin plugins out of library.zip
    removed:
      index.txt                      index.txt-20071121073725-0corxykv5irjal00-1
    added:
      tools/package_mf.py            package_mf.py-20080206141953-323gd0qb2z3tn5pc-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
      bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
      tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3193.34.12
        revision-id:bialix at ukr.net-20080223122738-t0o7ks71xmfyr46t
        parent: bialix at ukr.net-20080220103615-uxw9jc9m6l63ea27
        parent: pqm at pqm.ubuntu.com-20080223121051-ntecw60563jadb3s
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: plugins.for.bzr.exe
        timestamp: Sat 2008-02-23 14:27:38 +0200
        message:
          merge bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3193.34.11
        revision-id:bialix at ukr.net-20080220103615-uxw9jc9m6l63ea27
        parent: bialix at ukr.net-20080207075319-d9jj7as8i5ztiff7
        parent: pqm at pqm.ubuntu.com-20080220014008-9appc9kw4rjg8v1k
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: plugins.for.bzr.exe
        timestamp: Wed 2008-02-20 12:36:15 +0200
        message:
          merge bzr.dev; update patch for 1.3
        added:
          doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
        modified:
          .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/bundle/commands.py      __init__.py-20050617152058-1b6530d9ab85c11c
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
          bzrlib/plugins/launchpad/lp_indirect.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
          bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
          bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/smart/bzrdir.py         bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
          bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
          bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/version_info_formats/format_custom.py format_custom.py-20071029100350-ajovqhbpb5khf6gu-1
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3193.34.10
        revision-id:bialix at ukr.net-20080207075319-d9jj7as8i5ztiff7
        parent: bialix at ukr.net-20080206153312-qycs7u05d7fjtwqq
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: plugins.for.bzr.exe
        timestamp: Thu 2008-02-07 09:53:19 +0200
        message:
          some cleanup in package_mf.py; mention about load_from_zip() deprecation in NEWS.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          tools/package_mf.py            package_mf.py-20080206141953-323gd0qb2z3tn5pc-1
        ------------------------------------------------------------
        revno: 3193.34.9
        revision-id:bialix at ukr.net-20080206153312-qycs7u05d7fjtwqq
        parent: bialix at ukr.net-20080206145651-h5slxbso5ge20gz1
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: plugins.for.bzr.exe
        timestamp: Wed 2008-02-06 17:33:12 +0200
        message:
          Ian's review
        modified:
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3193.34.8
        revision-id:bialix at ukr.net-20080206145651-h5slxbso5ge20gz1
        parent: bialix at ukr.net-20080206143931-d6opyuqsg4tvxd7q
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: plugins.for.bzr.exe
        timestamp: Wed 2008-02-06 16:56:51 +0200
        message:
          update NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3193.34.7
        revision-id:bialix at ukr.net-20080206143931-d6opyuqsg4tvxd7q
        parent: bialix at ukr.net-20080206134353-hmkib323nxgq3tw6
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: plugins.for.bzr.exe
        timestamp: Wed 2008-02-06 16:39:31 +0200
        message:
          custom module finder to find additional dependencies for built-in plugins (to bundle additional packages and modules into bzr.exe's library.zip)
        added:
          tools/package_mf.py            package_mf.py-20080206141953-323gd0qb2z3tn5pc-1
        modified:
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3193.34.6
        revision-id:bialix at ukr.net-20080206134353-hmkib323nxgq3tw6
        parent: bialix at ukr.net-20080120223411-b8vfnw5y7p8b0vhp
        parent: pqm at pqm.ubuntu.com-20080201053934-q32y2nk5vvo13c6v
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: plugins.for.bzr.exe
        timestamp: Wed 2008-02-06 15:43:53 +0200
        message:
          merge bzr.dev
        removed:
          bzrlib/plugins/multiparent.py  mpregen-20070411063203-5x9z7i73add0d6f6-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
          bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
          bzrlib/doc/api/__init__.py     __init__.py-20051224020744-7b87d590843855bc
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
          bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
          bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
          bzrlib/reconfigure.py          reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_nonascii.py  testnonascii.py-20051018022645-ea1d8b6477b058a6
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3193.34.5
        revision-id:bialix at ukr.net-20080120223411-b8vfnw5y7p8b0vhp
        parent: bialix at ukr.net-20080120220828-lfbqgmpqi7bloog2
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: plugins.for.bzr.exe
        timestamp: Mon 2008-01-21 00:34:11 +0200
        message:
          deprecate bzrlib.plugins.load_from_zip feature; remove 0.91-deprecated function all_plugins()
        modified:
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
        ------------------------------------------------------------
        revno: 3193.34.4
        revision-id:bialix at ukr.net-20080120220828-lfbqgmpqi7bloog2
        parent: bialix at ukr.net-20080120215138-9whefgyqt8rfdcbb
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: plugins.for.bzr.exe
        timestamp: Mon 2008-01-21 00:08:28 +0200
        message:
          update script for windows installer
        modified:
          tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
        ------------------------------------------------------------
        revno: 3193.34.3
        revision-id:bialix at ukr.net-20080120215138-9whefgyqt8rfdcbb
        parent: bialix at ukr.net-20080120214833-pys4tt50avj6ml4n
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: plugins.for.bzr.exe
        timestamp: Sun 2008-01-20 23:51:38 +0200
        message:
          bzr.exe: move builtin plugins (launchpad, multiparent) out of library.zip to plugins directory
        modified:
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3193.34.2
        revision-id:bialix at ukr.net-20080120214833-pys4tt50avj6ml4n
        parent: bialix at ukr.net-20080120203253-wnra9hhip9jv962e
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: plugins.for.bzr.exe
        timestamp: Sun 2008-01-20 23:48:33 +0200
        message:
          removed junk file ./index.txt
        removed:
          index.txt                      index.txt-20071121073725-0corxykv5irjal00-1
        ------------------------------------------------------------
        revno: 3193.34.1
        revision-id:bialix at ukr.net-20080120203253-wnra9hhip9jv962e
        parent: pqm at pqm.ubuntu.com-20080118055224-sskoia4bcpxd8wzu
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: plugins.for.bzr.exe
        timestamp: Sun 2008-01-20 22:32:53 +0200
        message:
          system-wide plugins for bzr.exe works even if BZR_PLUGIN_PATH env variable is set.
        modified:
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
    ------------------------------------------------------------
    revno: 3193.1.37
    revision-id:pqm at pqm.ubuntu.com-20080223121051-ntecw60563jadb3s
    parent: pqm at pqm.ubuntu.com-20080222065317-v0xvap07o35t0ymj
    parent: bialix at ukr.net-20080223102409-1hx325d2zvjwgmy4
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2008-02-23 12:10:51 +0000
    message:
      (bialix) BZR_LOG env. variable controls location of .bzr.log
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
      bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
        ------------------------------------------------------------
        revno: 3193.33.9
        revision-id:bialix at ukr.net-20080223102409-1hx325d2zvjwgmy4
        parent: bialix at ukr.net-20080216100317-xg1hdw306evlgt94
        parent: pqm at pqm.ubuntu.com-20080222065317-v0xvap07o35t0ymj
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: disable.bzr.log
        timestamp: Sat 2008-02-23 12:24:09 +0200
        message:
          merge bzr.dev
        added:
          doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
        modified:
          .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/smart/bzrdir.py         bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3193.33.8
        revision-id:bialix at ukr.net-20080216100317-xg1hdw306evlgt94
        parent: bialix at ukr.net-20080207084727-2eis03c4f2zf9inw
        parent: pqm at pqm.ubuntu.com-20080213062701-74mocrhfz0n4uj4r
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: disable.bzr.log
        timestamp: Sat 2008-02-16 12:03:17 +0200
        message:
          merge bzr.dev; update for 1.3; $BZR_LOG used in trace.py module (again), not in the main bzr script (req. by Robert Collins)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/bundle/commands.py      __init__.py-20050617152058-1b6530d9ab85c11c
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
          bzrlib/plugins/launchpad/lp_indirect.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
          bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
          bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
          bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
          bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
          bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
          bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/version_info_formats/format_custom.py format_custom.py-20071029100350-ajovqhbpb5khf6gu-1
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3193.33.7
        revision-id:bialix at ukr.net-20080207084727-2eis03c4f2zf9inw
        parent: bialix at ukr.net-20080206100717-wnixj1s8u2fks08r
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: disable.bzr.log
        timestamp: Thu 2008-02-07 10:47:27 +0200
        message:
          If BZR_HOME environment variable is defined then default location for .bzr.log trace file is ``$BZR_HOME/.bzr.log`` (required for proper testing BZR_LOG environment variable).
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
        ------------------------------------------------------------
        revno: 3193.33.6
        revision-id:bialix at ukr.net-20080206100717-wnixj1s8u2fks08r
        parent: bialix at ukr.net-20080206100501-2krf98tgske339aw
        parent: pqm at pqm.ubuntu.com-20080201053934-q32y2nk5vvo13c6v
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: disable.bzr.log
        timestamp: Wed 2008-02-06 12:07:17 +0200
        message:
          merge bzr.dev
        removed:
          bzrlib/plugins/multiparent.py  mpregen-20070411063203-5x9z7i73add0d6f6-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
          bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
          bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_nonascii.py  testnonascii.py-20051018022645-ea1d8b6477b058a6
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3193.33.5
        revision-id:bialix at ukr.net-20080206100501-2krf98tgske339aw
        parent: bialix at ukr.net-20080206100156-wpsmtdnf9x8pn79c
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: disable.bzr.log
        timestamp: Wed 2008-02-06 12:05:01 +0200
        message:
          help topic on $BZR_LOG differentiate between *nix and Win32
        modified:
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
        ------------------------------------------------------------
        revno: 3193.33.4
        revision-id:bialix at ukr.net-20080206100156-wpsmtdnf9x8pn79c
        parent: bialix at ukr.net-20080128224819-88buaniv5dwy9vx4
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: disable.bzr.log
        timestamp: Wed 2008-02-06 12:01:56 +0200
        message:
          blackbox tests for `bzr version` command output to check $BZR_LOG effect
        modified:
          bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
        ------------------------------------------------------------
        revno: 3193.33.3
        revision-id:bialix at ukr.net-20080128224819-88buaniv5dwy9vx4
        parent: bialix at ukr.net-20080128222213-gitken71eyvdd203
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: disable.bzr.log
        timestamp: Tue 2008-01-29 00:48:19 +0200
        message:
          $BZR_LOG is used to contol location of .bzr.log (use /dev/null or NUL to suppress log).
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
        ------------------------------------------------------------
        revno: 3193.33.2
        revision-id:bialix at ukr.net-20080128222213-gitken71eyvdd203
        parent: bialix at ukr.net-20080128084024-i01fle19i8ij3p9t
        parent: pqm at pqm.ubuntu.com-20080125195940-iwy2onaiiges6k4t
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: disable.bzr.log
        timestamp: Tue 2008-01-29 00:22:13 +0200
        message:
          merge bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
          bzrlib/doc/api/__init__.py     __init__.py-20051224020744-7b87d590843855bc
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/reconfigure.py          reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
        ------------------------------------------------------------
        revno: 3193.33.1
        revision-id:bialix at ukr.net-20080128084024-i01fle19i8ij3p9t
        parent: pqm at pqm.ubuntu.com-20080118055224-sskoia4bcpxd8wzu
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: disable.bzr.log
        timestamp: Mon 2008-01-28 10:40:24 +0200
        message:
          ``BZR_LOG=disable`` suppresses writing messages to .bzr.log.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
    ------------------------------------------------------------
    revno: 3193.1.36
    revision-id:pqm at pqm.ubuntu.com-20080222065317-v0xvap07o35t0ymj
    parent: pqm at pqm.ubuntu.com-20080220014008-9appc9kw4rjg8v1k
    parent: james at jamesh.id.au-20080222011619-8mm40wtm4av4pmnj
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-02-22 06:53:17 +0000
    message:
      merge --preview now works for merges that add or modify symlinks
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3193.32.3
        revision-id:james at jamesh.id.au-20080222011619-8mm40wtm4av4pmnj
        parent: james at jamesh.id.au-20080222005231-v0jc2dpf8vtgzbu5
        committer: James Henstridge <james at jamesh.id.au>
        branch nick: bzr.preview-symlink
        timestamp: Fri 2008-02-22 10:16:19 +0900
        message:
          add NEWS entry
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3193.32.2
        revision-id:james at jamesh.id.au-20080222005231-v0jc2dpf8vtgzbu5
        parent: james at jamesh.id.au-20080222003900-ydgbr0oq20dto7a9
        committer: James Henstridge <james at jamesh.id.au>
        branch nick: bzr.preview-symlink
        timestamp: Fri 2008-02-22 09:52:31 +0900
        message:
          Simplify test, and move it down to be next to the other _PreviewTree tests.
        modified:
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
        ------------------------------------------------------------
        revno: 3193.32.1
        revision-id:james at jamesh.id.au-20080222003900-ydgbr0oq20dto7a9
        parent: pqm at pqm.ubuntu.com-20080220014008-9appc9kw4rjg8v1k
        committer: James Henstridge <james at jamesh.id.au>
        branch nick: bzr.preview-symlink
        timestamp: Fri 2008-02-22 09:39:00 +0900
        message:
          * Add get_symlink_target() method to bzrlib.transform._PreviewTree, so 
            that "bzr merge --preview" works for trees with symlinks.
          * Add a corresponding test.
        modified:
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
    ------------------------------------------------------------
    revno: 3193.1.35
    revision-id:pqm at pqm.ubuntu.com-20080220014008-9appc9kw4rjg8v1k
    parent: pqm at pqm.ubuntu.com-20080219222102-rqz9oxck1qbibvkm
    parent: robertc at robertcollins.net-20080219041134-03amd7siou1c8ugw
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2008-02-20 01:40:08 +0000
    message:
      Add external references support attribute to repository formats.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/smart/bzrdir.py         bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
      bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
      bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
      bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
      bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
      bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
        ------------------------------------------------------------
        revno: 3193.31.5
        revision-id:robertc at robertcollins.net-20080219041134-03amd7siou1c8ugw
        parent: robertc at robertcollins.net-20080219035832-lyyksopcl80ncwes
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: repository-stackable-flag
        timestamp: Tue 2008-02-19 15:11:34 +1100
        message:
          Relocate NEWS entries to 1.3.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3193.31.4
        revision-id:robertc at robertcollins.net-20080219035832-lyyksopcl80ncwes
        parent: robertc at robertcollins.net-20080212051725-m8fjb5ouzl1pkso0
        parent: pqm at pqm.ubuntu.com-20080219014045-w3igijttjdcpwshz
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: repository-stackable-flag
        timestamp: Tue 2008-02-19 14:58:32 +1100
        message:
          Integrate bzr.dev.
        added:
          doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
        modified:
          .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/bundle/commands.py      __init__.py-20050617152058-1b6530d9ab85c11c
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
          bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3193.31.3
        revision-id:robertc at robertcollins.net-20080212051725-m8fjb5ouzl1pkso0
        parent: robertc at robertcollins.net-20080212045218-2yo8xf84u7458320
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: repository-stackable-flag
        timestamp: Tue 2008-02-12 16:17:25 +1100
        message:
           * Hook up the new remote method ``RemoteBzrDir.find_repositoryV2`` so
             that it is now attempted first when lookup up repositories, leading to
             an extra round trip on older bzr smart servers but supporting the
             feature on newer servers. (Robert Collins)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/smart/bzrdir.py         bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
        ------------------------------------------------------------
        revno: 3193.31.2
        revision-id:robertc at robertcollins.net-20080212045218-2yo8xf84u7458320
        parent: robertc at robertcollins.net-20080212023827-019lghqbrm3tukgl
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: repository-stackable-flag
        timestamp: Tue 2008-02-12 15:52:18 +1100
        message:
           * New remote method ``RemoteBzrDir.find_repositoryV2`` adding support for
             detecting external lookup support on remote repositories.
             (Robert Collins)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/smart/bzrdir.py         bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
        ------------------------------------------------------------
        revno: 3193.31.1
        revision-id:robertc at robertcollins.net-20080212023827-019lghqbrm3tukgl
        parent: pqm at pqm.ubuntu.com-20080208064756-bg0zu0y4e789j50r
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: repository-stackable-flag
        timestamp: Tue 2008-02-12 13:38:27 +1100
        message:
           * Repository formats have a new supported-feature attribute
             ``supports_external_lookups`` used to indicate repositories which support
             falling back to other repositories when they have partial data.
             (Robert Collins)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
    ------------------------------------------------------------
    revno: 3193.1.34
    revision-id:pqm at pqm.ubuntu.com-20080219222102-rqz9oxck1qbibvkm
    parent: pqm at pqm.ubuntu.com-20080219014045-w3igijttjdcpwshz
    parent: bialix at ukr.net-20080219091728-qg1xo2i5r4r3u72w
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-02-19 22:21:02 +0000
    message:
      (bialix) Include quick-start-summary.svg file to python-based installer
       for Windows (bug #192924)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 3193.30.1
        revision-id:bialix at ukr.net-20080219091728-qg1xo2i5r4r3u72w
        parent: pqm at pqm.ubuntu.com-20080213062701-74mocrhfz0n4uj4r
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: bugfix.192924
        timestamp: Tue 2008-02-19 11:17:28 +0200
        message:
          (bialix) Include quick-start-summary.svg file to python-based installer for Windows (bug #192924)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 3193.1.33
    revision-id:pqm at pqm.ubuntu.com-20080219014045-w3igijttjdcpwshz
    parent: pqm at pqm.ubuntu.com-20080218234410-0w6zg2617n24of1m
    parent: robertc at robertcollins.net-20080213221140-0h6pxt7zdm7af20d
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-02-19 01:40:45 +0000
    message:
      (robertc) Add development formats and methodology. (Robert Collins)
    added:
      doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
      bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
      bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
        ------------------------------------------------------------
        revno: 3152.2.3
        revision-id:robertc at robertcollins.net-20080213221140-0h6pxt7zdm7af20d
        parent: robertc at robertcollins.net-20080106200422-x8yz6cxotlzltvwp
        parent: pqm at pqm.ubuntu.com-20080213062701-74mocrhfz0n4uj4r
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: experimental
        timestamp: Thu 2008-02-14 09:11:40 +1100
        message:
          Merge up with bzr.dev.
        removed:
          bzrlib/plugins/multiparent.py  mpregen-20070411063203-5x9z7i73add0d6f6-1
        added:
          bzrlib/tests/repository_implementations/test_has_revisions.py test_has_revisions.p-20080111035443-xaupgdsx5fw1q54b-1
          bzrlib/tests/test_http_implementations.py test_http_implementa-20071218210003-65nh81gglcfvurw6-1
          contrib/bzr_access             bzr_access-20071210163004-c9lb1renhra2ncg0-1
          doc/developers/inventory.txt   inventory.txt-20080103013957-opkrhxy6lmywmx4i-1
          doc/developers/lca-merge.txt   lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
          doc/en/user-guide/revnos.txt   revnos.txt-20080111231928-pbntxea0ynh9ww1t-1
        renamed:
          bzrlib/tests/HTTPTestUtil.py => bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
          bzrlib/tests/HttpServer.py => bzrlib/tests/http_server.py httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          README                         README-20050309040720-8f368abf9f346b9d
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/bugtracker.py           bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/commands.py      __init__.py-20050617152058-1b6530d9ab85c11c
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
          bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/doc/api/__init__.py     __init__.py-20051224020744-7b87d590843855bc
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/help_topics/en/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
          bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
          bzrlib/plugins/launchpad/lp_indirect.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
          bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
          bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
          bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
          bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
          bzrlib/reconfigure.py          reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
          bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
          bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
          bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
          bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
          bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
          bzrlib/smart/vfs.py            vfs.py-20061108095550-gunadhxmzkdjfeek-2
          bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
          bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/TestUtil.py       TestUtil.py-20050824080200-5f70140a2d938694
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_annotate.py testannotate.py-20051013044000-457f44801bfa9d39
          bzrlib/tests/blackbox/test_bundle_info.py test_bundle_info.py-20070816181255-eiuodwxuqu7w7gxf-1
          bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
          bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
          bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
          bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
          bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/branch_implementations/test_http.py test_http.py-20060731224648-2eef7ae5yja95rya-1
          bzrlib/tests/branch_implementations/test_parent.py test_parent.py-20050830052751-5e62766623c32222
          bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
          bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
          bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
          bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
          bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
          bzrlib/tests/test_nonascii.py  testnonascii.py-20051018022645-ea1d8b6477b058a6
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_progress.py  test_progress.py-20060308160359-978c397bc79b7fda
          bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_revert.py    test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
          bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
          bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_tsort.py     testtsort.py-20051025073946-27da871c394d5be4
          bzrlib/tests/test_urlutils.py  test_urlutils.py-20060502192900-46b1f9579987cf9c
          bzrlib/tests/test_version_info.py test_version_info.py-20051228204928-2c364e30b702b41b
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/tests/test_win32utils.py test_win32utils.py-20070713181630-8xsrjymd3e8mgw23-108
          bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
          bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
          bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
          bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
          bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
          bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/tsort.py                tsort.py-20051025073946-7808f6aaf7d07208
          bzrlib/urlutils.py             urlutils.py-20060502195429-e8a161ecf8fac004
          bzrlib/version_info_formats/format_custom.py format_custom.py-20071029100350-ajovqhbpb5khf6gu-1
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
          doc/en/tutorials/using_bazaar_with_launchpad.txt using_bazaar_with_lp-20071211073140-7msh8uf9a9h4y9hb-1
          doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
          doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
          doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
          doc/en/user-guide/index.txt    index.txt-20060622101119-tgwtdci8z769bjb9-2
          tools/rst2html.py              rst2html.py-20060817120932-gn177u8v0008txhu-1
          bzrlib/tests/http_utils.py     HTTPTestUtil.py-20050914180604-247d3aafb7a43343
          bzrlib/tests/http_server.py    httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
        ------------------------------------------------------------
        revno: 3152.2.2
        revision-id:robertc at robertcollins.net-20080106200422-x8yz6cxotlzltvwp
        parent: robertc at robertcollins.net-20080102223046-h8nxufr1v21pnei2
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: experimental
        timestamp: Mon 2008-01-07 07:04:22 +1100
        message:
          The bzrdir format registry now accepts an ``alias`` keyword to
          register_metadir, used to indicate that a format name is an alias for
          some other format and thus should not be reported when describing the
          format. (Robert Collins)
          -------------- This line and the fmllowing will be ignored --------------
          
          modified:
            NEWS
            bzrlib/bzrdir.py
            bzrlib/info.py
            bzrlib/tests/test_bzrdir.py
            bzrlib/tests/test_info.py
          
          === modified file 'NEWS'
          --- a/NEWS	2008-01-02 22:30:46 +0000
          +++ b/NEWS	2008-01-06 20:04:15 +0000
          @@ -135,6 +135,11 @@
               * Patience Diff now supports arbitrary python objects, as long as they
                 support ``hash()``. (John Arbash Meinel)
           
          +    * The bzrdir format registry now accepts an ``alias`` keyword to
          +      register_metadir, used to indicate that a format name is an alias for
          +      some other format and thus should not be reported when describing the
          +      format. (Robert Collins)
          +
             API BREAKS:
           
             TESTING:
          
          === modified file 'bzrlib/bzrdir.py'
          --- a/bzrlib/bzrdir.py	2008-01-02 22:30:46 +0000
          +++ b/bzrlib/bzrdir.py	2008-01-06 19:41:29 +0000
          @@ -2447,12 +2447,22 @@
               e.g. BzrDirMeta1 with weave repository.  Also, it's more user-oriented.
               """
           
          +    def __init__(self):
          +        """Create a BzrDirFormatRegistry."""
          +        self._aliases = set()
          +        super(BzrDirFormatRegistry, self).__init__()
          +
          +    def aliases(self):
          +        """Return a set of the format names which are aliases."""
          +        return frozenset(self._aliases)
          +
               def register_metadir(self, key,
                        repository_format, help, native=True, deprecated=False,
                        branch_format=None,
                        tree_format=None,
                        hidden=False,
          -             experimental=False):
          +             experimental=False,
          +             alias=False):
                   """Register a metadir subformat.
           
                   These all use a BzrDirMetaFormat1 bzrdir, but can be parameterized
          @@ -2491,10 +2501,10 @@
                           bd.repository_format = _load(repository_format)
                       return bd
                   self.register(key, helper, help, native, deprecated, hidden,
          -            experimental)
          +            experimental, alias)
           
               def register(self, key, factory, help, native=True, deprecated=False,
          -                 hidden=False, experimental=False):
          +                 hidden=False, experimental=False, alias=False):
                   """Register a BzrDirFormat factory.
                   
                   The factory must be a callable that takes one parameter: the key.
          @@ -2505,11 +2515,15 @@
                   """
                   registry.Registry.register(self, key, factory, help,
                       BzrDirFormatInfo(native, deprecated, hidden, experimental))
          +        if alias:
          +            self._aliases.add(key)
           
               def register_lazy(self, key, module_name, member_name, help, native=True,
          -                      deprecated=False, hidden=False, experimental=False):
          +        deprecated=False, hidden=False, experimental=False, alias=False):
                   registry.Registry.register_lazy(self, key, module_name, member_name,
                       help, BzrDirFormatInfo(native, deprecated, hidden, experimental))
          +        if alias:
          +            self._aliases.add(key)
           
               def set_default(self, key):
                   """Set the 'default' key to be a clone of the supplied key.
          @@ -2518,6 +2532,7 @@
                   """
                   registry.Registry.register(self, 'default', self.get(key),
                       self.get_help(key), info=self.get_info(key))
          +        self._aliases.add('default')
           
               def set_default_repository(self, key):
                   """Set the FormatRegistry default and Repository default.
          @@ -2670,6 +2685,7 @@
               tree_format='bzrlib.workingtree.WorkingTreeFormat4',
               hidden=False,
               )
          +# The following two formats should always just be aliases.
           format_registry.register_metadir('development',
               'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment0',
               help='Current development format. Can convert data to and from pack-0.92 '
          @@ -2681,6 +2697,7 @@
               branch_format='bzrlib.branch.BzrBranchFormat6',
               tree_format='bzrlib.workingtree.WorkingTreeFormat4',
               experimental=True,
          +    alias=True,
               )
           format_registry.register_metadir('development-subtree',
               'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment0Subtree',
          @@ -2693,7 +2710,9 @@
               branch_format='bzrlib.branch.BzrBranchFormat6',
               tree_format='bzrlib.workingtree.WorkingTreeFormat4',
               experimental=True,
          +    alias=True,
               )
          +# And the development formats which the will have aliased one of follow:
           format_registry.register_metadir('development0',
               'bzrlib.repofmt.pack_repo.RepositoryFormatPackDevelopment0',
               help='Trivial rename of pack-0.92 to provide a development format. '
          
          === modified file 'bzrlib/info.py'
          --- a/bzrlib/info.py	2007-11-06 09:00:25 +0000
          +++ b/bzrlib/info.py	2008-01-06 20:01:30 +0000
          @@ -440,7 +440,9 @@
                   tree.bzrdir.root_transport.base):
                   branch = None
                   repository = None
          -    for key in bzrdir.format_registry.keys():
          +    non_aliases = set(bzrdir.format_registry.keys())
          +    non_aliases.difference_update(bzrdir.format_registry.aliases())
          +    for key in non_aliases:
                   format = bzrdir.format_registry.make_bzrdir(key)
                   if isinstance(format, bzrdir.BzrDirMetaFormat1):
                       if (tree and format.workingtree_format !=
          @@ -457,11 +459,12 @@
                   candidates.append(key)
               if len(candidates) == 0:
                   return 'unnamed'
          -    new_candidates = [c for c in candidates if c != 'default']
          -    if len(new_candidates) > 0:
          -        candidates = new_candidates
          +    candidates.sort()
               new_candidates = [c for c in candidates if not
                   bzrdir.format_registry.get_info(c).hidden]
               if len(new_candidates) > 0:
          +        # If there are any non-hidden formats that match, only return those to
          +        # avoid listing hidden formats except when only a hidden format will
          +        # do.
                   candidates = new_candidates
               return ' or '.join(candidates)
          
          === modified file 'bzrlib/tests/test_bzrdir.py'
          --- a/bzrlib/tests/test_bzrdir.py	2007-12-21 20:32:22 +0000
          +++ b/bzrlib/tests/test_bzrdir.py	2008-01-06 19:45:00 +0000
          @@ -170,6 +170,16 @@
                   finally:
                       bzrdir.format_registry.set_default_repository(old_default)
           
          +    def test_aliases(self):
          +        a_registry = bzrdir.BzrDirFormatRegistry()
          +        a_registry.register('weave', bzrdir.BzrDirFormat6,
          +            'Pre-0.8 format.  Slower and does not support checkouts or shared'
          +            ' repositories', deprecated=True)
          +        a_registry.register('weavealias', bzrdir.BzrDirFormat6,
          +            'Pre-0.8 format.  Slower and does not support checkouts or shared'
          +            ' repositories', deprecated=True, alias=True)
          +        self.assertEqual(frozenset(['weavealias']), a_registry.aliases())
          +    
           
           class SampleBranch(bzrlib.branch.Branch):
               """A dummy branch for guess what, dummy use."""
          
          === modified file 'bzrlib/tests/test_info.py'
          --- a/bzrlib/tests/test_info.py	2007-11-26 13:55:51 +0000
          +++ b/bzrlib/tests/test_info.py	2008-01-06 20:02:10 +0000
          @@ -126,16 +126,22 @@
           
               def test_describe_tree_format(self):
                   for key in bzrdir.format_registry.keys():
          -            if key == 'default':
          +            if key in bzrdir.format_registry.aliases():
                           continue
                       self.assertTreeDescription(key)
           
               def test_describe_checkout_format(self):
                   for key in bzrdir.format_registry.keys():
          -            if key in ('default', 'weave', 'experimental'):
          -                continue
          -            if key.startswith('experimental-'):
          -                # these are typically hidden or aliases for other formats
          +            if key in bzrdir.format_registry.aliases():
          +                # Aliases will not describe correctly in the UI because the
          +                # real format is found.
          +                continue
          +            # legacy: weave does not support checkouts
          +            if key == 'weave':
          +                continue
          +            if bzrdir.format_registry.get_info(key).experimental:
          +                # We don't require that experimental formats support checkouts
          +                # or describe correctly in the UI.
                           continue
                       expected = None
                       if key in ('dirstate', 'dirstate-tags', 'dirstate-with-subtree',
          @@ -149,7 +155,7 @@
           
               def test_describe_branch_format(self):
                   for key in bzrdir.format_registry.keys():
          -            if key == 'default':
          +            if key in bzrdir.format_registry.aliases():
                           continue
                       expected = None
                       if key in ('dirstate', 'knit'):
          @@ -158,7 +164,7 @@
           
               def test_describe_repo_format(self):
                   for key in bzrdir.format_registry.keys():
          -            if key == 'default':
          +            if key in bzrdir.format_registry.aliases():
                           continue
                       expected = None
                       if key in ('dirstate', 'knit', 'dirstate-tags'):
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
        ------------------------------------------------------------
        revno: 3152.2.1
        revision-id:robertc at robertcollins.net-20080102223046-h8nxufr1v21pnei2
        parent: pqm at pqm.ubuntu.com-20080102154906-hqiq6x2eammznjtg
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: experimental
        timestamp: Thu 2008-01-03 09:30:46 +1100
        message:
          * A new repository format 'development' has been added. This format will
            represent the latest 'in-progress' format that the bzr developers are
            interested in getting early-adopter testing and feedback on.
            ``doc/developers/development-repo.txt`` has detailed information.
            (Robert Collins)
        added:
          doc/developers/development-repo.txt developmentrepo.txt-20080102200205-raj42k61dch8pjmj-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
    ------------------------------------------------------------
    revno: 3193.1.32
    revision-id:pqm at pqm.ubuntu.com-20080218234410-0w6zg2617n24of1m
    parent: pqm at pqm.ubuntu.com-20080213062701-74mocrhfz0n4uj4r
    parent: john at arbash-meinel.com-20080218211742-fdd2sw2nvubl9cg8
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2008-02-18 23:44:10 +0000
    message:
      (jam) Ignore .dll for building on cygwin
    modified:
      .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
    ------------------------------------------------------------
    revno: 3193.29.1
    revision-id:john at arbash-meinel.com-20080218211742-fdd2sw2nvubl9cg8
    parent: pqm at pqm.ubuntu.com-20080213062701-74mocrhfz0n4uj4r
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: annotate_cleanup
    timestamp: Mon 2008-02-18 15:17:42 -0600
    message:
      ignore .dll for cygwin
    modified:
      .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
-------------- next part --------------

Diff too large for email (6478 lines, the limit is 1000).


More information about the bazaar-commits mailing list