Rev 2237: merge up from bzr.dev to get metadir changes in http://sourcefrog.net/bzr/tags

Martin Pool mbp at sourcefrog.net
Thu Feb 15 01:23:33 GMT 2007


At http://sourcefrog.net/bzr/tags

------------------------------------------------------------
revno: 2237
revision-id: mbp at sourcefrog.net-20070215012329-blt2xfhup97r6w8h
parent: mbp at sourcefrog.net-20070213131837-7p45uhe445mwk4c4
parent: pqm at pqm.ubuntu.com-20070213180251-612e7e18b4fdbac0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: tags
timestamp: Thu 2007-02-15 12:23:29 +1100
message:
  merge up from bzr.dev to get metadir changes
added:
  bzrlib/plugins/launchpad/lp_indirect.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
  bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
  bzrlib/repofmt/                repofmt-20070124052833-mplndq0aywl30b35-1
  bzrlib/repofmt/__init__.py     __init__.py-20070206060649-j4kznrq6xkjmy092-1
  bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
  bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
  bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
  bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
  bzrlib/tests/branch_implementations/test_last_revision_info.py test_last_revision_i-20070201133317-51mzi40m8hv1i0i9-1
  bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
  bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
  bzrlib/tests/repository_implementations/test_statistics.py test_statistics.py-20070203082432-6738e8fl0mm7ikre-1
  bzrlib/tests/test_delta.py     test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
  bzrlib/tests/test_generate_docs.py test_generate_docs.p-20070102123151-cqctnsrlqwmiljd7-1
  bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
renamed:
  bzrlib/win32console.py => bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
modified:
  HACKING                        HACKING-20050805200004-2a5dc975d870f78c
  Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
  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/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
  bzrlib/decorators.py           decorators.py-20060112082512-6bfc2d882df1698d
  bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/gpg.py                  gpg.py-20051017065112-8654536d415dacc6
  bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
  bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
  bzrlib/inter.py                inter.py-20060302012326-a57300cb382c618f
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/lockdir.py              lockdir.py-20060220222025-98258adf27fbdda3
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  bzrlib/memorytree.py           memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
  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/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
  bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
  bzrlib/shellcomplete.py        shellcomplete.py-20050822153127-3be115ff5e70fc39
  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_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
  bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
  bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
  bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
  bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
  bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
  bzrlib/tests/blackbox/test_ls.py test_ls.py-20060712232047-0jraqpecwngee12y-1
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
  bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
  bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
  bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
  bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
  bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
  bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
  bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
  bzrlib/tests/branch_implementations/test_bound_sftp.py test_bound_sftp.py-20051231055311-2f96048c4f0940ef
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
  bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
  bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
  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_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  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_decorators.py test_decorators.py-20060113063037-0e7bd4566758f4fa
  bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
  bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
  bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
  bzrlib/tests/test_gpg.py       testgpg.py-20051017042228-9276cd40a784c93c
  bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
  bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
  bzrlib/tests/test_lockdir.py   test_lockdir.py-20060220222025-33d4221569a3d600
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
  bzrlib/tests/test_options.py   testoptions.py-20051014093702-96457cfc86319a8f
  bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
  bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
  bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_source.py    test_source.py-20051207061333-a58dea6abecc030d
  bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
  bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
  bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
  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/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
  bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/uncommit.py             uncommit.py-20050626215513-5ec509fa425b305c
  bzrlib/urlutils.py             urlutils.py-20060502195429-e8a161ecf8fac004
  bzrlib/version.py              version.py-20060816024207-ves6ult9a11taj9t-1
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
  bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
  tools/doc_generate/autodoc_man.py bzrman.py-20050601153041-0ff7f74de456d15e
  tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
  tools/win32/bzr-win32-bdist-postinstall.py bzrwin32bdistpostinstall.py-20060629085133-098bsfj3va8jc0ql-1
  tools/win32/bzr.iss.cog        bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
  tools/win32/bzr_postinstall.py bzr_postinstall.py-20060622100836-b3yup582rt3y0nvm-6
  tools/win32/start_bzr.bat      start_bzr.bat-20060622100836-b3yup582rt3y0nvm-9
  bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
    ------------------------------------------------------------
    revno: 2220.1.64
    merged: pqm at pqm.ubuntu.com-20070213180251-612e7e18b4fdbac0
    parent: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
    parent: john at arbash-meinel.com-20070213161227-neb9gdl0o9z90s0f
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-02-13 18:02:51 +0000
    message:
      (John Arbash Meinel) (trivial) remove unused and incorrect code.
        ------------------------------------------------------------
        revno: 2220.1.63.1.1
        merged: john at arbash-meinel.com-20070213161227-neb9gdl0o9z90s0f
        parent: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Tue 2007-02-13 10:12:27 -0600
        message:
          (John Arbash Meinel) (trivial) remove unused and incorrect code.
    ------------------------------------------------------------
    revno: 2220.1.63
    merged: pqm at pqm.ubuntu.com-20070213114814-9606106906ac312f
    parent: pqm at pqm.ubuntu.com-20070213100658-2d02fdea9b5ac1d5
    parent: mbp at sourcefrog.net-20070213072810-ofxj46bg7en5tx4e
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-02-13 11:48:14 +0000
    message:
      (mbp) split repository formats into repofmt (r=john)
        ------------------------------------------------------------
        revno: 2220.1.21.1.20
        merged: mbp at sourcefrog.net-20070213072810-ofxj46bg7en5tx4e
        parent: mbp at sourcefrog.net-20070213052239-09atqsahwth6zdm1
        committer: mbp at sourcefrog.net
        branch nick: repoformats
        timestamp: Tue 2007-02-13 18:28:10 +1100
        message:
          update tests for new locations of weave repos
        ------------------------------------------------------------
        revno: 2220.1.21.1.19
        merged: mbp at sourcefrog.net-20070213052239-09atqsahwth6zdm1
        parent: mbp at sourcefrog.net-20070213014725-i3ocm09caz2y15b5
        parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
        committer: mbp at sourcefrog.net
        branch nick: repoformats
        timestamp: Tue 2007-02-13 16:22:39 +1100
        message:
          (merge) trunk
        ------------------------------------------------------------
        revno: 2220.1.21.1.18
        merged: mbp at sourcefrog.net-20070213014725-i3ocm09caz2y15b5
        parent: mbp at sourcefrog.net-20070212071448-0jvjfcc44wlaraw8
        committer: mbp at sourcefrog.net
        branch nick: repoformats
        timestamp: Tue 2007-02-13 12:47:25 +1100
        message:
          Restore use of deprecating delegator for old formats in bzrlib.repository.
        ------------------------------------------------------------
        revno: 2220.1.21.1.17
        merged: mbp at sourcefrog.net-20070212071448-0jvjfcc44wlaraw8
        parent: mbp at sourcefrog.net-20070212065850-6i7a2btsua2b86tw
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: repoformats
        timestamp: Mon 2007-02-12 18:14:48 +1100
        message:
          Restore old InterWeave tests
        ------------------------------------------------------------
        revno: 2220.1.21.1.16
        merged: mbp at sourcefrog.net-20070212065850-6i7a2btsua2b86tw
        parent: mbp at sourcefrog.net-20070212063546-h2ku6z7fixzin6ur
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: repoformats
        timestamp: Mon 2007-02-12 17:58:50 +1100
        message:
          Just import repository formats into repository.py, rather than using special delegate
        ------------------------------------------------------------
        revno: 2220.1.21.1.15
        merged: mbp at sourcefrog.net-20070212063546-h2ku6z7fixzin6ur
        parent: mbp at sourcefrog.net-20070212061214-ff5rahaaqxz4jbtu
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: repoformats
        timestamp: Mon 2007-02-12 17:35:46 +1100
        message:
          doc
        ------------------------------------------------------------
        revno: 2220.1.21.1.14
        merged: mbp at sourcefrog.net-20070212061214-ff5rahaaqxz4jbtu
        parent: mbp at sourcefrog.net-20070212050955-ctczxopwvmco8rv0
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: repoformats
        timestamp: Mon 2007-02-12 17:12:14 +1100
        message:
          Add deprecated forwarders for old formats from repository.py
        ------------------------------------------------------------
        revno: 2220.1.21.1.13
        merged: mbp at sourcefrog.net-20070212050955-ctczxopwvmco8rv0
        parent: mbp at sourcefrog.net-20070212042128-tad5xv28x4zubo5s
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: repoformats
        timestamp: Mon 2007-02-12 16:09:55 +1100
        message:
          Re-register InterWeaveRepo, fix test integration, add test for it
        ------------------------------------------------------------
        revno: 2220.1.21.1.12
        merged: mbp at sourcefrog.net-20070212042128-tad5xv28x4zubo5s
        parent: mbp at sourcefrog.net-20070207124145-qufbufe41sm6fqrf
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: repoformats
        timestamp: Mon 2007-02-12 15:21:28 +1100
        message:
          Restore InterWeaveRepo
        ------------------------------------------------------------
        revno: 2220.1.21.1.11
        merged: mbp at sourcefrog.net-20070207124145-qufbufe41sm6fqrf
        parent: mbp at sourcefrog.net-20070207120941-gd7ow6jzt5b4ughi
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: repoformats
        timestamp: Wed 2007-02-07 23:41:45 +1100
        message:
          Get rid of RepositoryFormat*_instance objects.  Instead the format
          registry can hold either format objects or factories that create them, and
          its get() method calls that if needed.
        ------------------------------------------------------------
        revno: 2220.1.21.1.10
        merged: mbp at sourcefrog.net-20070207120941-gd7ow6jzt5b4ughi
        parent: mbp at sourcefrog.net-20070207092559-yqv8864d88qnrlez
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: repoformats
        timestamp: Wed 2007-02-07 23:09:41 +1100
        message:
          Remove more references to weaves from the repository.py file
        ------------------------------------------------------------
        revno: 2220.1.21.1.9
        merged: mbp at sourcefrog.net-20070207092559-yqv8864d88qnrlez
        parent: mbp at sourcefrog.net-20070207092247-pww6djejoiu1av67
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: repoformats
        timestamp: Wed 2007-02-07 20:25:59 +1100
        message:
          Clean up some imports
        ------------------------------------------------------------
        revno: 2220.1.21.1.8
        merged: mbp at sourcefrog.net-20070207092247-pww6djejoiu1av67
        parent: mbp at sourcefrog.net-20070207091549-zfl9ws3ne5ysg4e8
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: repoformats
        timestamp: Wed 2007-02-07 20:22:47 +1100
        message:
          Set the repository's serializer in the places it's needed, not in the base class
        ------------------------------------------------------------
        revno: 2220.1.21.1.7
        merged: mbp at sourcefrog.net-20070207091549-zfl9ws3ne5ysg4e8
        parent: mbp at sourcefrog.net-20070207091131-458fw18bgytvaz7t
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: repoformats
        timestamp: Wed 2007-02-07 20:15:49 +1100
        message:
          rename method
        ------------------------------------------------------------
        revno: 2220.1.21.1.6
        merged: mbp at sourcefrog.net-20070207091131-458fw18bgytvaz7t
        parent: mbp at sourcefrog.net-20070206081613-dxop566k13bll6j0
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: repoformats
        timestamp: Wed 2007-02-07 20:11:31 +1100
        message:
          Move Knit repositories into the submodule bzrlib.repofmt.knitrepo and
          lazily load from the registry.
          
          InterRepo._matching_repo_format is now a method not a class field so that
          it can load repositories when we need them.
        ------------------------------------------------------------
        revno: 2220.1.21.1.5
        merged: mbp at sourcefrog.net-20070206081613-dxop566k13bll6j0
        parent: mbp at sourcefrog.net-20070206062724-a5uo1u27jxsal2t0
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: repoformats
        timestamp: Tue 2007-02-06 19:16:13 +1100
        message:
          Move KnitFormat2 into repofmt
        ------------------------------------------------------------
        revno: 2220.1.21.1.4
        merged: mbp at sourcefrog.net-20070206062724-a5uo1u27jxsal2t0
        parent: mbp at sourcefrog.net-20070125003522-27pc5240qbqtzfy3
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: repoformats
        timestamp: Tue 2007-02-06 17:27:24 +1100
        message:
          Moved old weave-based repository formats into bzrlib.repofmt.weaverepo.
          
          Change help for --format to just say 'see help formats'
          
          RepositoryFormat.register_metadir gains an optional parameter for the
          module name containing the repository format, and lazily loads from there.
          
          Disable test_interrepository_get_returns_correct_optimiser, because it
          seems too brittle.
          
          Remove InterWeaveRepo, these should now just be upgraded.
    ------------------------------------------------------------
    revno: 2220.1.62
    merged: pqm at pqm.ubuntu.com-20070213100658-2d02fdea9b5ac1d5
    parent: pqm at pqm.ubuntu.com-20070213074608-337e1db89805f74d
    parent: mbp at sourcefrog.net-20070213014053-2nb9jeb21vfuoxsi
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-02-13 10:06:58 +0000
    message:
      (mbp,trivial) fix option display in shell-complete 
        ------------------------------------------------------------
        revno: 2220.1.59.2.1
        merged: mbp at sourcefrog.net-20070213014053-2nb9jeb21vfuoxsi
        parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
        committer: mbp at sourcefrog.net
        branch nick: trivial
        timestamp: Tue 2007-02-13 12:40:53 +1100
        message:
          (trivial) fix short_name() call in shellcomplete
          (thanks to Matthias Ralf) #84826
    ------------------------------------------------------------
    revno: 2220.1.61
    merged: pqm at pqm.ubuntu.com-20070213074608-337e1db89805f74d
    parent: pqm at pqm.ubuntu.com-20070213040413-6b9f8b8ba554fcd5
    parent: john at arbash-meinel.com-20070212225848-lxl29d1xugdid79d
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-02-13 07:46:08 +0000
    message:
      (John Arbash Meinel) Fix pushing branches within the same repository by using a read lock on the source.
        ------------------------------------------------------------
        revno: 2220.1.59.1.3
        merged: john at arbash-meinel.com-20070212225848-lxl29d1xugdid79d
        parent: john at arbash-meinel.com-20070212224239-8tbgpw9qhooqitk1
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: push_readonly
        timestamp: Mon 2007-02-12 16:58:48 -0600
        message:
          Switch the test to being a branch_implementation test.
        ------------------------------------------------------------
        revno: 2220.1.59.1.2
        merged: john at arbash-meinel.com-20070212224239-8tbgpw9qhooqitk1
        parent: john at arbash-meinel.com-20070212223618-7cboppunmrb86n3b
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: push_readonly
        timestamp: Mon 2007-02-12 16:42:39 -0600
        message:
          Actually make the test a blackbox test.
        ------------------------------------------------------------
        revno: 2220.1.59.1.1
        merged: john at arbash-meinel.com-20070212223618-7cboppunmrb86n3b
        parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: push_readonly
        timestamp: Mon 2007-02-12 16:36:18 -0600
        message:
          Branch.push() only needs a read lock.
          By avoiding a write lock, we avoid deadlock when pushing within
          a single repository.
    ------------------------------------------------------------
    revno: 2220.1.60
    merged: pqm at pqm.ubuntu.com-20070213040413-6b9f8b8ba554fcd5
    parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
    parent: abentley at panoramicfeedback.com-20070212155720-7stn0gx0renqojuk
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-02-13 04:04:13 +0000
    message:
      bzr log works in local treeless branches (#84247)
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.19
        merged: abentley at panoramicfeedback.com-20070212155720-7stn0gx0renqojuk
        parent: abentley at panoramicfeedback.com-20070209182321-b4tw6uhxfx1o4xqi
        parent: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Mon 2007-02-12 10:57:20 -0500
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.18
        merged: abentley at panoramicfeedback.com-20070209182321-b4tw6uhxfx1o4xqi
        parent: abentley at panoramicfeedback.com-20070209180308-5k3im1mhn2wa8bg0
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Fri 2007-02-09 13:23:21 -0500
        message:
          Log works in local treeless branches (#84247)
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.17
        merged: abentley at panoramicfeedback.com-20070209180308-5k3im1mhn2wa8bg0
        parent: abentley at panoramicfeedback.com-20070208150047-li7efd5nxn6bi4ew
        parent: pqm at pqm.ubuntu.com-20070209011702-1aa0d624613e8953
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Fri 2007-02-09 13:03:08 -0500
        message:
          Merge from bzr.dev
    ------------------------------------------------------------
    revno: 2220.1.59
    merged: pqm at pqm.ubuntu.com-20070209195330-312ec52588462782
    parent: pqm at pqm.ubuntu.com-20070209011702-1aa0d624613e8953
    parent: abentley at panoramicfeedback.com-20070209185525-r2vlzgnopveimb9r
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-02-09 19:53:30 +0000
    message:
      Fix proxy authentication on urllib (Vincent Ladeuil)
        ------------------------------------------------------------
        revno: 2220.1.58.1.1
        merged: abentley at panoramicfeedback.com-20070209185525-r2vlzgnopveimb9r
        parent: pqm at pqm.ubuntu.com-20070209011702-1aa0d624613e8953
        parent: v.ladeuil+lp at free.fr-20070208170120-tfz2fd2fuv6dz5xg
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's integration
        timestamp: Fri 2007-02-09 13:55:25 -0500
        message:
          Merge vincent's proxy auth fix
        ------------------------------------------------------------
        revno: 2220.1.53.2.2
        merged: v.ladeuil+lp at free.fr-20070208170120-tfz2fd2fuv6dz5xg
        parent: v.ladeuil+lp at free.fr-20070208123313-22fcfuoj7g2j0x0o
        committer: v.ladeuil+lp at free.fr
        branch nick: bzr.83954
        timestamp: Thu 2007-02-08 18:01:20 +0100
        message:
          Really fix bug #83954, with tests.
          
          * bzrlib/transport/http/_urllib2_wrappers.py:
          (ProxyHandler.set_proxy): Handle the empty password case. Fix the
          header building which was broken by the way.
          
          * bzrlib/tests/test_http.py:
          (TestHttpProxyWhiteBox): Add tests for http proxy authorization
          header building.
        ------------------------------------------------------------
        revno: 2220.1.53.2.1
        merged: v.ladeuil+lp at free.fr-20070208123313-22fcfuoj7g2j0x0o
        parent: pqm at pqm.ubuntu.com-20070208031033-2ab8a0b14b6eaaba
        committer: v.ladeuil+lp at free.fr
        branch nick: bzr.83954
        timestamp: Thu 2007-02-08 13:33:13 +0100
        message:
          Fix bug #83954.
          
          * bzrlib/transport/http/_urllib2_wrappers.py:
          (ProxyHandler.set_proxy): Fix untested typo. (Bug #83594).
          
          * bzrlib/tests/test_http.py:
          (TestProxyHttpServer): Add a FIXME to test proxy authorization
          schemes once they become available in the test framework (already
          in progress in another branch).
    ------------------------------------------------------------
    revno: 2220.1.58
    merged: pqm at pqm.ubuntu.com-20070209011702-1aa0d624613e8953
    parent: pqm at pqm.ubuntu.com-20070208230603-37e3c5049e8996f6
    parent: john at arbash-meinel.com-20070208234024-w1s6kqucpdckj42i
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-02-09 01:17:02 +0000
    message:
      (John Arbash Meinel) restrict GPGStrategy.sign() to 8-bit strings
        ------------------------------------------------------------
        revno: 2220.1.53.1.2
        merged: john at arbash-meinel.com-20070208234024-w1s6kqucpdckj42i
        parent: john at arbash-meinel.com-20070208162805-dcqiqrwjh9a5lo7n
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: gpg-8-bit-only
        timestamp: Thu 2007-02-08 17:40:24 -0600
        message:
          Cleanup docstring for Aaron Bentley
        ------------------------------------------------------------
        revno: 2220.1.53.1.1
        merged: john at arbash-meinel.com-20070208162805-dcqiqrwjh9a5lo7n
        parent: pqm at pqm.ubuntu.com-20070208031033-2ab8a0b14b6eaaba
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: gpg-8-bit-only
        timestamp: Thu 2007-02-08 10:28:05 -0600
        message:
          ``GPGStrategy.sign()`` will now raise ``BzrBadParameterUnicode`` if
          you pass a Unicode string rather than an 8-bit string. It doesn't 
          make sense to sign a Unicode string, and it turns out that some 
          versions of python will write out the raw Unicode bytes rather than
          encoding automatically. So fail and make callers do the right thing.
    ------------------------------------------------------------
    revno: 2220.1.57
    merged: pqm at pqm.ubuntu.com-20070208230603-37e3c5049e8996f6
    parent: pqm at pqm.ubuntu.com-20070208161008-f87c6e192b109c27
    parent: john at arbash-meinel.com-20070208215704-87s4qnsjfqi4x83w
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-02-08 23:06:03 +0000
    message:
      (John Arbash Meinel) NEWS update (trivial)
        ------------------------------------------------------------
        revno: 2220.1.27.2.3
        merged: john at arbash-meinel.com-20070208215704-87s4qnsjfqi4x83w
        parent: john at arbash-meinel.com-20070201154301-j901oexquy5ue4uj
        parent: pqm at pqm.ubuntu.com-20070208031033-2ab8a0b14b6eaaba
        parent: pqm at pqm.ubuntu.com-20070208161008-f87c6e192b109c27
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: knit_no_pb
        timestamp: Thu 2007-02-08 15:57:04 -0600
        message:
          [merge] bzr.dev 2276
        ------------------------------------------------------------
        revno: 2220.1.27.2.2
        merged: john at arbash-meinel.com-20070201154301-j901oexquy5ue4uj
        parent: john at arbash-meinel.com-20070131185810-dh3c6xgjgo684hw8
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: knit_no_pb
        timestamp: Thu 2007-02-01 09:43:01 -0600
        message:
          NEWS for minor speed improvement.
    ------------------------------------------------------------
    revno: 2220.1.56
    merged: pqm at pqm.ubuntu.com-20070208161008-f87c6e192b109c27
    parent: pqm at pqm.ubuntu.com-20070208101205-c9191b6c45c53f23
    parent: abentley at panoramicfeedback.com-20070208150047-li7efd5nxn6bi4ew
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-02-08 16:10:08 +0000
    message:
      Hide unknowns and inventory
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.16
        merged: abentley at panoramicfeedback.com-20070208150047-li7efd5nxn6bi4ew
        parent: abentley at panoramicfeedback.com-20070208145838-flz9kmce6rwekxkg
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Thu 2007-02-08 10:00:47 -0500
        message:
          update NEWS
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.15
        merged: abentley at panoramicfeedback.com-20070208145838-flz9kmce6rwekxkg
        parent: abentley at panoramicfeedback.com-20070208145819-xqfhqmznhd6hh4ld
        parent: pqm at pqm.ubuntu.com-20070207142350-d0b5e937ce139c73
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Thu 2007-02-08 09:58:38 -0500
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.14
        merged: abentley at panoramicfeedback.com-20070208145819-xqfhqmznhd6hh4ld
        parent: abentley at panoramicfeedback.com-20070208143922-wy03itqs6qzqa3iq
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Thu 2007-02-08 09:58:19 -0500
        message:
          Add some blank lines
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.13
        merged: abentley at panoramicfeedback.com-20070208143922-wy03itqs6qzqa3iq
        parent: abentley at panoramicfeedback.com-20070206171212-65zcmjif0byeszgi
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Thu 2007-02-08 09:39:22 -0500
        message:
          Hide 'unknowns', document alterntatives to hidden commands
    ------------------------------------------------------------
    revno: 2220.1.55
    merged: pqm at pqm.ubuntu.com-20070208101205-c9191b6c45c53f23
    parent: pqm at pqm.ubuntu.com-20070208070647-fa39bee48393a769
    parent: mbp at sourcefrog.net-20070208083326-a5kfavayeuks9ctb
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-02-08 10:12:05 +0000
    message:
      (mbp) add lp: urls to plugin (r=john)
        ------------------------------------------------------------
        revno: 2220.1.25.8.7
        merged: mbp at sourcefrog.net-20070208083326-a5kfavayeuks9ctb
        parent: mbp at sourcefrog.net-20070126044410-x7dnlcdjbitbb3c2
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: lpurl
        timestamp: Thu 2007-02-08 19:33:26 +1100
        message:
          small review cleanups
        ------------------------------------------------------------
        revno: 2220.1.25.8.6
        merged: mbp at sourcefrog.net-20070126044410-x7dnlcdjbitbb3c2
        parent: mbp at sourcefrog.net-20070126031150-80cjzqt6e3f64b2m
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: lpurl
        timestamp: Fri 2007-01-26 15:44:10 +1100
        message:
          Documentation under 'help launchpad'
        ------------------------------------------------------------
        revno: 2220.1.25.8.5
        merged: mbp at sourcefrog.net-20070126031150-80cjzqt6e3f64b2m
        parent: mbp at sourcefrog.net-20070126030508-s5im2cxv57xqk7pu
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: lpurl
        timestamp: Fri 2007-01-26 14:11:50 +1100
        message:
          Add short-form lp:PRODUCT url form
        ------------------------------------------------------------
        revno: 2220.1.25.8.4
        merged: mbp at sourcefrog.net-20070126030508-s5im2cxv57xqk7pu
        parent: mbp at sourcefrog.net-20070126012338-4de0rkq7p5diyv47
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: lpurl
        timestamp: Fri 2007-01-26 14:05:08 +1100
        message:
          lp:/// indirection works
        ------------------------------------------------------------
        revno: 2220.1.25.8.3
        merged: mbp at sourcefrog.net-20070126012338-4de0rkq7p5diyv47
        parent: mbp at sourcefrog.net-20070126005547-fjzgd5vyw5tw38bd
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: lpurl
        timestamp: Fri 2007-01-26 12:23:38 +1100
        message:
          Start adding indirection transport
        ------------------------------------------------------------
        revno: 2220.1.25.8.2
        merged: mbp at sourcefrog.net-20070126005547-fjzgd5vyw5tw38bd
        parent: mbp at sourcefrog.net-20070126002801-uffztaglri8w29jl
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: lpurl
        timestamp: Fri 2007-01-26 11:55:47 +1100
        message:
          doc
        ------------------------------------------------------------
        revno: 2220.1.25.8.1
        merged: mbp at sourcefrog.net-20070126002801-uffztaglri8w29jl
        parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: lpurl
        timestamp: Fri 2007-01-26 11:28:01 +1100
        message:
          Start adding tests for launchpad indirection
    ------------------------------------------------------------
    revno: 2220.1.54
    merged: pqm at pqm.ubuntu.com-20070208070647-fa39bee48393a769
    parent: pqm at pqm.ubuntu.com-20070208031033-2ab8a0b14b6eaaba
    parent: robertc at robertcollins.net-20070206235330-2sy67ccuq0ksubqa
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-02-08 07:06:47 +0000
    message:
      (robertc) 4 new branch hooks: post_push, post_pull, post_commit, post_uncommit, and fix the inability to do a bzr pull --overwrite of a heavyweight checkout.
        ------------------------------------------------------------
        revno: 2220.1.26.1.4
        merged: robertc at robertcollins.net-20070206235330-2sy67ccuq0ksubqa
        parent: robertc at robertcollins.net-20070206023342-hv5o5qh6pdktiwbc
        parent: pqm at pqm.ubuntu.com-20070206205442-4a0752247e60cabf
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: branch-hooks
        timestamp: Wed 2007-02-07 10:53:30 +1100
        message:
          Merge HEAD.
        ------------------------------------------------------------
        revno: 2220.1.26.1.3
        merged: robertc at robertcollins.net-20070206023342-hv5o5qh6pdktiwbc
        parent: robertc at robertcollins.net-20070205175221-hi6pbqbplnekjoxh
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: branch-hooks
        timestamp: Tue 2007-02-06 13:33:42 +1100
        message:
          New branch hooks: post_push, post_pull, post_commit, post_uncommit. These
          complement the set_rh hook by allowing different actions, and awareness of
          the prior state of the branch, for operations where this matters.
          
          Fix the inability to do a bzr pull --overwrite of a heavyweight checkout.
          
          Add branch implementation tests for uncommit and commit.
          
          (Robert Collins)
        ------------------------------------------------------------
        revno: 2220.1.26.1.2
        merged: robertc at robertcollins.net-20070205175221-hi6pbqbplnekjoxh
        parent: robertc at robertcollins.net-20070130231333-k74ok5fytvxy1c2j
        parent: pqm at pqm.ubuntu.com-20070204124741-bc510e3fe6fb2962
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: branch-hooks
        timestamp: Tue 2007-02-06 04:52:21 +1100
        message:
          Update from HEAD.
        ------------------------------------------------------------
        revno: 2220.1.26.1.1
        merged: robertc at robertcollins.net-20070130231333-k74ok5fytvxy1c2j
        parent: pqm at pqm.ubuntu.com-20070130211230-64c2d9b4bce9304f
        parent: robertc at robertcollins.net-20070130211105-u8p44qh31vsn4xh3
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: branch-hooks
        timestamp: Wed 2007-01-31 10:13:33 +1100
        message:
          Merge splitting of branch.pull.
    ------------------------------------------------------------
    revno: 2220.1.53
    merged: pqm at pqm.ubuntu.com-20070208031033-2ab8a0b14b6eaaba
    parent: pqm at pqm.ubuntu.com-20070207230659-d4b568ed7b4cec4e
    parent: john at arbash-meinel.com-20070207225138-tvv9jlug3ky1arbd
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-02-08 03:10:33 +0000
    message:
      (James Westby, Aaron Bentley) Improve documentation for checkouts
        ------------------------------------------------------------
        revno: 2220.1.50.1.2
        merged: john at arbash-meinel.com-20070207225138-tvv9jlug3ky1arbd
        parent: john at arbash-meinel.com-20070207223107-vv8o1g6bimqlvtv3
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2007-02-07 16:51:38 -0600
        message:
          Tweak the help text for bind/unbind according to Robert's suggestions.
        ------------------------------------------------------------
        revno: 2220.1.50.1.1
        merged: john at arbash-meinel.com-20070207223107-vv8o1g6bimqlvtv3
        parent: pqm at pqm.ubuntu.com-20070207142350-d0b5e937ce139c73
        parent: jw+debian at jameswestby.net-20070203093033-57ebkvaucudqrf1i
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2007-02-07 16:31:07 -0600
        message:
          [merge] James Westby, Aaron Bentley 'bzr help checkouts'
        ------------------------------------------------------------
        revno: 2220.1.25.7.2
        merged: jw+debian at jameswestby.net-20070203093033-57ebkvaucudqrf1i
        parent: jw+debian at jameswestby.net-20070202001610-rgff0g0w3my07ymj
        committer: James Westby <jw+debian at jameswestby.net>
        branch nick: bzr.dev.helpcheckout
        timestamp: Sat 2007-02-03 09:30:33 +0000
        message:
          Update the checkouts help topic with the comments from Aaron.
          Add a NEWS entry for the change.
        ------------------------------------------------------------
        revno: 2220.1.25.7.1
        merged: jw+debian at jameswestby.net-20070202001610-rgff0g0w3my07ymj
        parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
        committer: James Westby <jw+debian at jameswestby.net>
        branch nick: bzr.dev.helpcheckout
        timestamp: Fri 2007-02-02 00:16:10 +0000
        message:
          Add a help topic describing checkouts and how they work.
          
          It's meant to be an overview of what they are and what they might be useful
          for, as well as a pointer to the commands that you need to manipulate them.
    ------------------------------------------------------------
    revno: 2220.1.52
    merged: pqm at pqm.ubuntu.com-20070207230659-d4b568ed7b4cec4e
    parent: pqm at pqm.ubuntu.com-20070207225551-26a710f4cc2f19a6
    parent: abentley at panoramicfeedback.com-20070207161056-iouamzaiam0ru7mf
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-02-07 23:06:59 +0000
    message:
      Use a Registry for merge-type options
        ------------------------------------------------------------
        revno: 2220.1.1.4.17
        merged: abentley at panoramicfeedback.com-20070207161056-iouamzaiam0ru7mf
        parent: abentley at panoramicfeedback.com-20070207160509-654375dogb1dva62
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: registryoption
        timestamp: Wed 2007-02-07 11:10:56 -0500
        message:
          PEP8-ness
        ------------------------------------------------------------
        revno: 2220.1.1.4.16
        merged: abentley at panoramicfeedback.com-20070207160509-654375dogb1dva62
        parent: abentley at panoramicfeedback.com-20070207153835-w2ydh6x5ejdxf8p0
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: registryoption
        timestamp: Wed 2007-02-07 11:05:09 -0500
        message:
          Add tests for get_merge_type_registry
        ------------------------------------------------------------
        revno: 2220.1.1.4.15
        merged: abentley at panoramicfeedback.com-20070207153835-w2ydh6x5ejdxf8p0
        parent: abentley at panoramicfeedback.com-20070207140301-6q963t7uhgf10utg
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: registryoption
        timestamp: Wed 2007-02-07 10:38:35 -0500
        message:
          Use RegistryOption for merge type
    ------------------------------------------------------------
    revno: 2220.1.51
    merged: pqm at pqm.ubuntu.com-20070207225551-26a710f4cc2f19a6
    parent: pqm at pqm.ubuntu.com-20070207142350-d0b5e937ce139c73
    parent: john at arbash-meinel.com-20070207193340-n9hakcy819gebhvs
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-02-07 22:55:51 +0000
    message:
      (John Arbash Meinel) allow 'bzr push' to resume an interrupted push, and push into an existing directory (#30576, #45504)
        ------------------------------------------------------------
        revno: 2220.1.7.3.5
        merged: john at arbash-meinel.com-20070207193340-n9hakcy819gebhvs
        parent: john at arbash-meinel.com-20070207193155-cmko0hwp4jctbwsl
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: fix_push_alt
        timestamp: Wed 2007-02-07 13:33:40 -0600
        message:
          Update NEWS for fixing bugs #30576, #45504
        ------------------------------------------------------------
        revno: 2220.1.7.3.4
        merged: john at arbash-meinel.com-20070207193155-cmko0hwp4jctbwsl
        parent: john at arbash-meinel.com-20070207192410-glvftt1r0zvsficw
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: fix_push_alt
        timestamp: Wed 2007-02-07 13:31:55 -0600
        message:
          Switch back to --use-existing-dir
        ------------------------------------------------------------
        revno: 2220.1.7.3.3
        merged: john at arbash-meinel.com-20070207192410-glvftt1r0zvsficw
        parent: john at arbash-meinel.com-20070207190954-krggmnrtirakr6va
        parent: pqm at pqm.ubuntu.com-20070207142350-d0b5e937ce139c73
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: fix_push_alt
        timestamp: Wed 2007-02-07 13:24:10 -0600
        message:
          [merge] bzr.dev 2270
        ------------------------------------------------------------
        revno: 2220.1.7.3.2
        merged: john at arbash-meinel.com-20070207190954-krggmnrtirakr6va
        parent: john at arbash-meinel.com-20070109195408-1spuyx876hjat226
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: fix_push_alt
        timestamp: Wed 2007-02-07 13:09:54 -0600
        message:
          Fix error message as suggested by Martin.
        ------------------------------------------------------------
        revno: 2220.1.7.3.1
        merged: john at arbash-meinel.com-20070109195408-1spuyx876hjat226
        parent: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: fix_push_alt
        timestamp: Tue 2007-01-09 13:54:08 -0600
        message:
          Allow push to create Branch when necessary, and add --use-existing
    ------------------------------------------------------------
    revno: 2220.1.50
    merged: pqm at pqm.ubuntu.com-20070207142350-d0b5e937ce139c73
    parent: pqm at pqm.ubuntu.com-20070207141218-c474ad3d5cf88311
    parent: abentley at panoramicfeedback.com-20070207140301-6q963t7uhgf10utg
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-02-07 14:23:50 +0000
    message:
      Fix NEWS
        ------------------------------------------------------------
        revno: 2220.1.1.4.14
        merged: abentley at panoramicfeedback.com-20070207140301-6q963t7uhgf10utg
        parent: abentley at panoramicfeedback.com-20070207135903-7x5lssjtn1c204nb
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: registryoption
        timestamp: Wed 2007-02-07 09:03:01 -0500
        message:
          update
    ------------------------------------------------------------
    revno: 2220.1.49
    merged: pqm at pqm.ubuntu.com-20070207141218-c474ad3d5cf88311
    parent: pqm at pqm.ubuntu.com-20070206205442-4a0752247e60cabf
    parent: abentley at panoramicfeedback.com-20070207135903-7x5lssjtn1c204nb
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-02-07 14:12:18 +0000
    message:
      Turn log format into registry option, clean up registry options
        ------------------------------------------------------------
        revno: 2220.1.1.4.13
        merged: abentley at panoramicfeedback.com-20070207135903-7x5lssjtn1c204nb
        parent: aaron.bentley at utoronto.ca-20070207034037-sx1twhf86tvmfl5p
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: registryoption
        timestamp: Wed 2007-02-07 08:59:03 -0500
        message:
          Add title to log format option section
        ------------------------------------------------------------
        revno: 2220.1.1.4.12
        merged: aaron.bentley at utoronto.ca-20070207034037-sx1twhf86tvmfl5p
        parent: aaron.bentley at utoronto.ca-20070207030958-fx6ykp7rg7zma6xu
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: registryoption
        timestamp: Tue 2007-02-06 22:40:37 -0500
        message:
          Add option grouping to RegistryOption and clean up format options
        ------------------------------------------------------------
        revno: 2220.1.1.4.11
        merged: aaron.bentley at utoronto.ca-20070207030958-fx6ykp7rg7zma6xu
        parent: abentley at panoramicfeedback.com-20070117194323-xe0mbw9tlkl65enx
        parent: pqm at pqm.ubuntu.com-20070206205442-4a0752247e60cabf
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: registryoption
        timestamp: Tue 2007-02-06 22:09:58 -0500
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        revno: 2220.1.1.4.10
        merged: abentley at panoramicfeedback.com-20070117194323-xe0mbw9tlkl65enx
        parent: abentley at panoramicfeedback.com-20070117163240-lj6ttc8m57mdrsj0
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: registryoption
        timestamp: Wed 2007-01-17 14:43:23 -0500
        message:
          Implement log options using RegistryOption
    ------------------------------------------------------------
    revno: 2220.1.48
    merged: pqm at pqm.ubuntu.com-20070206205442-4a0752247e60cabf
    parent: pqm at pqm.ubuntu.com-20070206193545-d5eac67ff047ce5c
    parent: abentley at panoramicfeedback.com-20070206153230-39dpslyj1bkk781l
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-02-06 20:54:42 +0000
    message:
      Commit supports kind changes
        ------------------------------------------------------------
        revno: 1959.4.6
        merged: abentley at panoramicfeedback.com-20070206153230-39dpslyj1bkk781l
        parent: abentley at panoramicfeedback.com-20070206145804-a71ecyr3hgh8vhma
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: typechange
        timestamp: Tue 2007-02-06 10:32:30 -0500
        message:
          Ensure merge works across kind changes
        ------------------------------------------------------------
        revno: 1959.4.5
        merged: abentley at panoramicfeedback.com-20070206145804-a71ecyr3hgh8vhma
        parent: abentley at panoramicfeedback.com-20070206145406-yconkndx4kesw9q3
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: typechange
        timestamp: Tue 2007-02-06 09:58:04 -0500
        message:
          add NEWS entry
        ------------------------------------------------------------
        revno: 1959.4.4
        merged: abentley at panoramicfeedback.com-20070206145406-yconkndx4kesw9q3
        parent: abentley at panoramicfeedback.com-20070206145216-fcpi8o3ufvuzwbp9
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: typechange
        timestamp: Tue 2007-02-06 09:54:06 -0500
        message:
          Trim trailing whitespace
        ------------------------------------------------------------
        revno: 1959.4.3
        merged: abentley at panoramicfeedback.com-20070206145216-fcpi8o3ufvuzwbp9
        parent: abentley at panoramicfeedback.com-20060928134810-2c8ae086a4a70f43
        parent: pqm at pqm.ubuntu.com-20070205115536-6fb4bf1e665880ac
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: typechange
        timestamp: Tue 2007-02-06 09:52:16 -0500
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        revno: 1959.4.2
        merged: abentley at panoramicfeedback.com-20060928134810-2c8ae086a4a70f43
        parent: aaron.bentley at utoronto.ca-20060826203316-d7112744d0ea94fc
        parent: pqm at pqm.ubuntu.com-20060927204431-5871ab3ef6affaf3
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: typechange
        timestamp: Thu 2006-09-28 09:48:10 -0400
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        revno: 1959.4.1
        merged: aaron.bentley at utoronto.ca-20060826203316-d7112744d0ea94fc
        parent: pqm at pqm.ubuntu.com-20060825200624-719b2ca847a04dfa
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: typechange
        timestamp: Sat 2006-08-26 16:33:16 -0400
        message:
          Correctly handle all file kind changes
    ------------------------------------------------------------
    revno: 2220.1.47
    merged: pqm at pqm.ubuntu.com-20070206193545-d5eac67ff047ce5c
    parent: pqm at pqm.ubuntu.com-20070205115536-6fb4bf1e665880ac
    parent: abentley at panoramicfeedback.com-20070206171212-65zcmjif0byeszgi
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-02-06 19:35:45 +0000
    message:
      Change status --short output to use ChangeReporter
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.12
        merged: abentley at panoramicfeedback.com-20070206171212-65zcmjif0byeszgi
        parent: abentley at panoramicfeedback.com-20070206160926-36crsd8hhr6724o8
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Tue 2007-02-06 12:12:12 -0500
        message:
          Handle simultaneous creation+rename
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.11
        merged: abentley at panoramicfeedback.com-20070206160926-36crsd8hhr6724o8
        parent: abentley at panoramicfeedback.com-20070206155925-952ik6mflb0oz652
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Tue 2007-02-06 11:09:26 -0500
        message:
          Handle case where file-id only is added
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.10
        merged: abentley at panoramicfeedback.com-20070206155925-952ik6mflb0oz652
        parent: abentley at panoramicfeedback.com-20070206140232-gquogvtlahelx4ha
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Tue 2007-02-06 10:59:25 -0500
        message:
          Add help text
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.9
        merged: abentley at panoramicfeedback.com-20070206140232-gquogvtlahelx4ha
        parent: abentley at panoramicfeedback.com-20070205153447-fx4eq36mk9q4idue
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Tue 2007-02-06 09:02:32 -0500
        message:
          Add test cases for status with kind change
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.8
        merged: abentley at panoramicfeedback.com-20070205153447-fx4eq36mk9q4idue
        parent: abentley at panoramicfeedback.com-20070205152754-n4y80twdvl69eguj
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Mon 2007-02-05 10:34:47 -0500
        message:
          Make ChangeReporter interface nicer
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.7
        merged: abentley at panoramicfeedback.com-20070205152754-n4y80twdvl69eguj
        parent: abentley at panoramicfeedback.com-20070202152938-96tdyxy8lcg7j802
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Mon 2007-02-05 10:27:54 -0500
        message:
          Use new-style output for status
    ------------------------------------------------------------
    revno: 2220.1.46
    merged: pqm at pqm.ubuntu.com-20070205115536-6fb4bf1e665880ac
    parent: pqm at pqm.ubuntu.com-20070205073805-fe53a1d3e1184c95
    parent: mbp at sourcefrog.net-20070205111322-cbd3yty86inw76ro
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-02-05 11:55:36 +0000
    message:
      (mbp) make TestSFTPInit.test_init_existing_branch less fragile with working directory name (trivial)
        ------------------------------------------------------------
        revno: 2220.1.44.1.1
        merged: mbp at sourcefrog.net-20070205111322-cbd3yty86inw76ro
        parent: pqm at pqm.ubuntu.com-20070204152137-9848ed97ad8e6a88
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: trivial
        timestamp: Mon 2007-02-05 22:13:22 +1100
        message:
          make TestSFTPInit.test_init_existing_branch less fragile (jamesw)
    ------------------------------------------------------------
    revno: 2220.1.45
    merged: pqm at pqm.ubuntu.com-20070205073805-fe53a1d3e1184c95
    parent: pqm at pqm.ubuntu.com-20070204152137-9848ed97ad8e6a88
    parent: bialix at ukr.net-20070205061738-t0pt6euik97cespt
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-02-05 07:38:05 +0000
    message:
      (bialix) Fix recursive upwalk for win32 UNC path (r=robert)
        ------------------------------------------------------------
        revno: 2220.1.25.6.3
        merged: bialix at ukr.net-20070205061738-t0pt6euik97cespt
        parent: bialix at ukr.net-20070205051913-2yipyjathfr6638z
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: win32.unc.path
        timestamp: Mon 2007-02-05 08:17:38 +0200
        message:
          EmulatedWin32LocalTransport should provide their own 'clone' method
        ------------------------------------------------------------
        revno: 2220.1.25.6.2
        merged: bialix at ukr.net-20070205051913-2yipyjathfr6638z
        parent: bialix at ukr.net-20070128214332-wgvrj0xkb31ltfbc
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: win32.unc.path
        timestamp: Mon 2007-02-05 07:19:13 +0200
        message:
          Fix name of emulated Win32LocalTransport as Robert suggested.
        ------------------------------------------------------------
        revno: 2220.1.25.6.1
        merged: bialix at ukr.net-20070128214332-wgvrj0xkb31ltfbc
        parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: win32.unc.path
        timestamp: Sun 2007-01-28 23:43:32 +0200
        message:
          win32 UNC path: recursive cloning UNC path to root stops on //HOST, not on //
    ------------------------------------------------------------
    revno: 2220.1.44
    merged: pqm at pqm.ubuntu.com-20070204152137-9848ed97ad8e6a88
    parent: pqm at pqm.ubuntu.com-20070204143007-ee1d0712bf5bccdf
    parent: abentley at panoramicfeedback.com-20070202152938-96tdyxy8lcg7j802
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2007-02-04 15:21:37 +0000
    message:
      Support kind changes in tree deltas
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.6
        merged: abentley at panoramicfeedback.com-20070202152938-96tdyxy8lcg7j802
        parent: abentley at panoramicfeedback.com-20070202135202-78r1yntnepqcuic2
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Fri 2007-02-02 10:29:38 -0500
        message:
          Support kind changes in tree deltas
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.5
        merged: abentley at panoramicfeedback.com-20070202135202-78r1yntnepqcuic2
        parent: abentley at panoramicfeedback.com-20070201145904-nrzbl3vkwjssrkhb
        parent: pqm at pqm.ubuntu.com-20070202101652-5367171684fe2eec
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Fri 2007-02-02 08:52:02 -0500
        message:
          Merge bzr.dev
    ------------------------------------------------------------
    revno: 2220.1.43
    merged: pqm at pqm.ubuntu.com-20070204143007-ee1d0712bf5bccdf
    parent: pqm at pqm.ubuntu.com-20070204135042-a3daa4b7a72e7596
    parent: larstiq at larstiq.dyndns.org-20070204141152-h21zd23n0igf59ja
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2007-02-04 14:30:07 +0000
    message:
      (John Arbash Meinel) Don't create a progress bar for simple knit reading.
        ------------------------------------------------------------
        revno: 2220.1.42.1.1
        merged: larstiq at larstiq.dyndns.org-20070204141152-h21zd23n0igf59ja
        parent: pqm at pqm.ubuntu.com-20070204135042-a3daa4b7a72e7596
        parent: john at arbash-meinel.com-20070131185810-dh3c6xgjgo684hw8
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: bzr.dev
        timestamp: Sun 2007-02-04 15:11:52 +0100
        message:
          (John Arbash Meinel) Don't create a progress bar for simple knit reading.
        ------------------------------------------------------------
        revno: 2220.1.27.2.1
        merged: john at arbash-meinel.com-20070131185810-dh3c6xgjgo684hw8
        parent: pqm at pqm.ubuntu.com-20070131140456-56881c31a01089a3
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: knit_no_pb
        timestamp: Wed 2007-01-31 12:58:10 -0600
        message:
          Don't create pb for simple knit reading.
    ------------------------------------------------------------
    revno: 2220.1.42
    merged: pqm at pqm.ubuntu.com-20070204135042-a3daa4b7a72e7596
    parent: pqm at pqm.ubuntu.com-20070204124741-bc510e3fe6fb2962
    parent: larstiq at larstiq.dyndns.org-20070204124955-w2l163jtnw28i46n
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2007-02-04 13:50:42 +0000
    message:
      Merge `bzr rm unversioned` fix. (Marius Kruger)
        ------------------------------------------------------------
        revno: 2220.1.38.2.1
        merged: larstiq at larstiq.dyndns.org-20070204124955-w2l163jtnw28i46n
        parent: pqm at pqm.ubuntu.com-20070202204950-910381483d737306
        parent: marius.kruger at enerweb.co.za-20070130155642-jrjusc3yj2rvqobi
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: bzr.dev
        timestamp: Sun 2007-02-04 13:49:55 +0100
        message:
          Merge `bzr rm unversioned` fix. (Marius Kruger)
        ------------------------------------------------------------
        revno: 2220.1.25.5.1
        merged: marius.kruger at enerweb.co.za-20070130155642-jrjusc3yj2rvqobi
        parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
        committer: Marius Kruger <marius.kruger at enerweb.co.za>
        branch nick: bzr.rm_error_to_note
        timestamp: Tue 2007-01-30 17:56:42 +0200
        message:
          Let bzr rm rather give a warning than an error when trying to remove a non-versioned file.
    ------------------------------------------------------------
    revno: 2220.1.41
    merged: pqm at pqm.ubuntu.com-20070204124741-bc510e3fe6fb2962
    parent: pqm at pqm.ubuntu.com-20070203195358-c2d9c5b94445119b
    parent: robertc at robertcollins.net-20070204123551-yw876d2dmdhyb3nw
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2007-02-04 12:47:41 +0000
    message:
      (robertc) Move info stats gathering into Repository.gather_stats allowing server optimisation.
        ------------------------------------------------------------
        revno: 2220.1.40.1.1
        merged: robertc at robertcollins.net-20070204123551-yw876d2dmdhyb3nw
        parent: pqm at pqm.ubuntu.com-20070203195358-c2d9c5b94445119b
        parent: robertc at robertcollins.net-20070203105604-z5stj4qy1r038m7x
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Sun 2007-02-04 23:35:51 +1100
        message:
          (robertc) Move info stats gathering into Repository.gather_stats allowing server optimisation.
        ------------------------------------------------------------
        revno: 2220.1.38.1.2
        merged: robertc at robertcollins.net-20070203105604-z5stj4qy1r038m7x
        parent: robertc at robertcollins.net-20070203100211-bf9qwy73gh40nszi
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss.api.changes
        timestamp: Sat 2007-02-03 21:56:04 +1100
        message:
          New version of gather_stats which gathers aggregate data too.
        ------------------------------------------------------------
        revno: 2220.1.38.1.1
        merged: robertc at robertcollins.net-20070203100211-bf9qwy73gh40nszi
        parent: pqm at pqm.ubuntu.com-20070202204950-910381483d737306
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: hpss.api.changes
        timestamp: Sat 2007-02-03 21:02:11 +1100
        message:
          Move info branch statistics gathering into the repository to allow smart server optimisation (Robert Collins).
    ------------------------------------------------------------
    revno: 2220.1.40
    merged: pqm at pqm.ubuntu.com-20070203195358-c2d9c5b94445119b
    parent: pqm at pqm.ubuntu.com-20070203162012-b09dab5423fa3c50
    parent: bialix at ukr.net-20070203073605-xkzsgkm13bgmmdkf
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2007-02-03 19:53:58 +0000
    message:
      (bialix) win32-related selftest fixes (r=john)
        ------------------------------------------------------------
        revno: 2220.1.20.1.3
        merged: bialix at ukr.net-20070203073605-xkzsgkm13bgmmdkf
        parent: bialix at ukr.net-20070128181932-css19mjca9nyt8cn
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.fixes
        timestamp: Sat 2007-02-03 09:36:05 +0200
        message:
          win32: skip tests that try to use funky chars in fileid in Weave-based repositories
        ------------------------------------------------------------
        revno: 2220.1.20.1.2
        merged: bialix at ukr.net-20070128181932-css19mjca9nyt8cn
        parent: bialix at ukr.net-20070128181553-rtyivph5j4xn1yle
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.fixes
        timestamp: Sun 2007-01-28 20:19:32 +0200
        message:
          test_contents_merge2: skip this test on win32
        ------------------------------------------------------------
        revno: 2220.1.20.1.1
        merged: bialix at ukr.net-20070128181553-rtyivph5j4xn1yle
        parent: pqm at pqm.ubuntu.com-20070117184107-a6267599a6b636f1
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: selftest.fixes
        timestamp: Sun 2007-01-28 20:15:53 +0200
        message:
          test_external_diff_binary: run external diff with --binary flag
    ------------------------------------------------------------
    revno: 2220.1.39
    merged: pqm at pqm.ubuntu.com-20070203162012-b09dab5423fa3c50
    parent: pqm at pqm.ubuntu.com-20070202204950-910381483d737306
    parent: bialix at ukr.net-20070203150206-wvlmm64itjghmm1w
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2007-02-03 16:20:12 +0000
    message:
      (bialix) Support for Windows 98
        ------------------------------------------------------------
        revno: 2220.1.25.4.11
        merged: bialix at ukr.net-20070203150206-wvlmm64itjghmm1w
        parent: bialix at ukr.net-20070202091430-vdgouvazded1yfqw
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: win98.support
        timestamp: Sat 2007-02-03 17:02:06 +0200
        message:
          Small fixes after John's review; added NEWS entry
        ------------------------------------------------------------
        revno: 2220.1.25.4.10
        merged: bialix at ukr.net-20070202091430-vdgouvazded1yfqw
        parent: bialix at ukr.net-20070201133216-a0wm6nuylfjgqsh7
        parent: pqm at pqm.ubuntu.com-20070202061004-5fdd6c2715ccaaa9
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: win98.support
        timestamp: Fri 2007-02-02 11:14:30 +0200
        message:
          merge bzr.dev
        ------------------------------------------------------------
        revno: 2220.1.25.4.9
        merged: bialix at ukr.net-20070201133216-a0wm6nuylfjgqsh7
        parent: bialix at ukr.net-20070131115836-lqp9u79n2t8xk3eg
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: win98.support
        timestamp: Thu 2007-02-01 15:32:16 +0200
        message:
          Inno Setup script: using {cmd} macro instead of env varibale substitution (%COMSPEC%)
        ------------------------------------------------------------
        revno: 2220.1.25.4.8
        merged: bialix at ukr.net-20070131115836-lqp9u79n2t8xk3eg
        parent: bialix at ukr.net-20070130230535-kx1rd478rtigyc3v
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: win98.support
        timestamp: Wed 2007-01-31 13:58:36 +0200
        message:
          bzr_postinstall.py: on win98 path added to autoexec.bat should have 8.3 form
        ------------------------------------------------------------
        revno: 2220.1.25.4.7
        merged: bialix at ukr.net-20070130230535-kx1rd478rtigyc3v
        parent: bialix at ukr.net-20070130151852-pahtk2exx9f1jff9
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: win98.support
        timestamp: Wed 2007-01-31 01:05:35 +0200
        message:
          standalone installer: win98 support
        ------------------------------------------------------------
        revno: 2220.1.25.4.6
        merged: bialix at ukr.net-20070130151852-pahtk2exx9f1jff9
        parent: bialix at ukr.net-20070130124550-gggzj7fx8forp9gy
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: win98.support
        timestamp: Tue 2007-01-30 17:18:52 +0200
        message:
          osutils.py: terminal_width() now use win32utils.get_console_size()
        ------------------------------------------------------------
        revno: 2220.1.25.4.5
        merged: bialix at ukr.net-20070130124550-gggzj7fx8forp9gy
        parent: bialix at ukr.net-20070130121318-a03bj0mol21o1rup
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: win98.support
        timestamp: Tue 2007-01-30 14:45:50 +0200
        message:
          bzr-win32-bdist-postinstall.py: good win98 support
        ------------------------------------------------------------
        revno: 2220.1.25.4.4
        merged: bialix at ukr.net-20070130121318-a03bj0mol21o1rup
        parent: bialix at ukr.net-20070130120420-ab6pl6xjl973ujrf
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: win98.support
        timestamp: Tue 2007-01-30 14:13:18 +0200
        message:
          setup.py: fix plain 'python setup.py install' for win98
        ------------------------------------------------------------
        revno: 2220.1.25.4.3
        merged: bialix at ukr.net-20070130120420-ab6pl6xjl973ujrf
        parent: bialix at ukr.net-20070130105138-280dj0ayzeh886rb
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: win98.support
        timestamp: Tue 2007-01-30 14:04:20 +0200
        message:
          config.py: changing _auto_user_id() and config_dir() to use functions from win32utils
        ------------------------------------------------------------
        revno: 2220.1.25.4.2
        merged: bialix at ukr.net-20070130105138-280dj0ayzeh886rb
        parent: bialix at ukr.net-20070130105014-cc3qlr06htp2zddv
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: win98.support
        timestamp: Tue 2007-01-30 12:51:38 +0200
        message:
          trace.py: open_tracefile(): win98-compatible detection of location for .bzr.log
          
          It's also change default location of .bzr.log on Windows 2000/XP as well:
          now it in user's My Documents folder, so it's much better 
          for users without administarator priveleges.
          
          Also workaround win32-specific issue with file.tell().
        ------------------------------------------------------------
        revno: 2220.1.25.4.1
        merged: bialix at ukr.net-20070130105014-cc3qlr06htp2zddv
        parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: win98.support
        timestamp: Tue 2007-01-30 12:50:14 +0200
        message:
          win32utils: Windows-specific functions that use Win32 API via ctypes
    ------------------------------------------------------------
    revno: 2220.1.38
    merged: pqm at pqm.ubuntu.com-20070202204950-910381483d737306
    parent: pqm at pqm.ubuntu.com-20070202101652-5367171684fe2eec
    parent: robertc at robertcollins.net-20070202203028-q6hq7cjxggr6yj3g
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-02-02 20:49:50 +0000
    message:
      (robertc) Merge support for import bzrlib.plugins.NAME.
        ------------------------------------------------------------
        revno: 2220.1.37.1.1
        merged: robertc at robertcollins.net-20070202203028-q6hq7cjxggr6yj3g
        parent: pqm at pqm.ubuntu.com-20070202101652-5367171684fe2eec
        parent: robertc at robertcollins.net-20070202202753-uu1ixgssi7471vi9
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Sat 2007-02-03 07:30:28 +1100
        message:
          (robertc) Merge support for import bzrlib.plugins.NAME.
        ------------------------------------------------------------
        revno: 2220.1.36.2.3
        merged: robertc at robertcollins.net-20070202202753-uu1ixgssi7471vi9
        parent: robertc at robertcollins.net-20070202161755-zy2d68928wqwehj6
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: plugin-import
        timestamp: Sat 2007-02-03 07:27:53 +1100
        message:
          Review feedback.
        ------------------------------------------------------------
        revno: 2220.1.36.2.2
        merged: robertc at robertcollins.net-20070202161755-zy2d68928wqwehj6
        parent: robertc at robertcollins.net-20070202104806-2lfxhf4zsocxuc43
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: plugin-hook
        timestamp: Sat 2007-02-03 03:17:55 +1100
        message:
          Allow 'import bzrlib.plugins.NAME' to work when the plugin NAME has not
          yet been loaded by load_plugins(). This allows plugins to depend on each
          other for code reuse without requiring users to perform file-renaming
          gymnastics. (Robert Collins)
        ------------------------------------------------------------
        revno: 2220.1.36.2.1
        merged: robertc at robertcollins.net-20070202104806-2lfxhf4zsocxuc43
        parent: pqm at pqm.ubuntu.com-20070202061004-5fdd6c2715ccaaa9
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: plugin-hook
        timestamp: Fri 2007-02-02 21:48:06 +1100
        message:
          Cleanup commented out cruft in plugin tests.
    ------------------------------------------------------------
    revno: 2220.1.37
    merged: pqm at pqm.ubuntu.com-20070202101652-5367171684fe2eec
    parent: pqm at pqm.ubuntu.com-20070202061004-5fdd6c2715ccaaa9
    parent: robertc at robertcollins.net-20070202091723-xtak1zzhe2ylwksa
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-02-02 10:16:52 +0000
    message:
      (robertc) Merge new Branch.last_revision_info method.
        ------------------------------------------------------------
        revno: 2220.1.36.1.1
        merged: robertc at robertcollins.net-20070202091723-xtak1zzhe2ylwksa
        parent: pqm at pqm.ubuntu.com-20070202061004-5fdd6c2715ccaaa9
        parent: larstiq at larstiq.dyndns.org-20070201144747-3szl1p7drs9v1hkh
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Fri 2007-02-02 20:17:23 +1100
        message:
          (robertc) Merge new Branch.last_revision_info method.
        ------------------------------------------------------------
        revno: 2220.1.29.4.2
        merged: larstiq at larstiq.dyndns.org-20070201144747-3szl1p7drs9v1hkh
        parent: larstiq at larstiq.dyndns.org-20070201133345-5hsm5hxzqbvmtklr
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: tip.info
        timestamp: Thu 2007-02-01 15:47:47 +0100
        message:
          Convert callers of Branch.revision_history() to Branch.last_revision_info() where sensible.
          (Wouter van Heyst, Robert Collins)
        ------------------------------------------------------------
        revno: 2220.1.29.4.1
        merged: larstiq at larstiq.dyndns.org-20070201133345-5hsm5hxzqbvmtklr
        parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: tip.info
        timestamp: Thu 2007-02-01 14:33:45 +0100
        message:
          New Branch.last_revision_info method, this is being done to allow
          optimization of requests for both the number of revisions and the last
          revision of a branch with smartservers and potentially future branch
          formats. (Wouter van Heyst, Robert Collins)
    ------------------------------------------------------------
    revno: 2220.1.36
    merged: pqm at pqm.ubuntu.com-20070202061004-5fdd6c2715ccaaa9
    parent: pqm at pqm.ubuntu.com-20070201235951-11ed96907aa6bce4
    parent: aaron.bentley at utoronto.ca-20070202043256-g5isx794qet9sxrd
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-02-02 06:10:04 +0000
    message:
      remove default repository format, deprecate get_format_type
        ------------------------------------------------------------
        revno: 2220.1.35.1.1
        merged: aaron.bentley at utoronto.ca-20070202043256-g5isx794qet9sxrd
        parent: pqm at pqm.ubuntu.com-20070201235951-11ed96907aa6bce4
        parent: abentley at panoramicfeedback.com-20070126221558-yvlrk159l9ctsn8p
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: bzr.ab.integration
        timestamp: Thu 2007-02-01 23:32:56 -0500
        message:
          Merge my own bundle
        ------------------------------------------------------------
        revno: 2204.4.13.1.5
        merged: abentley at panoramicfeedback.com-20070126221558-yvlrk159l9ctsn8p
        parent: abentley at panoramicfeedback.com-20070126215616-3rwy48ob0qfkcj3j
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: format-registry
        timestamp: Fri 2007-01-26 17:15:58 -0500
        message:
          Remove RepositoryFormat.set_default_format, deprecate get_format_type
        ------------------------------------------------------------
        revno: 2204.4.13.1.4
        merged: abentley at panoramicfeedback.com-20070126215616-3rwy48ob0qfkcj3j
        parent: abentley at panoramicfeedback.com-20070117221420-njgdmqom87nsjrlx
        parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: format-registry
        timestamp: Fri 2007-01-26 16:56:16 -0500
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        revno: 2204.4.13.1.3
        merged: abentley at panoramicfeedback.com-20070117221420-njgdmqom87nsjrlx
        parent: abentley at panoramicfeedback.com-20070109140826-3qm6nlgvbv5tp62c
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: format-registry
        timestamp: Wed 2007-01-17 17:14:20 -0500
        message:
          zap old repository default handling
    ------------------------------------------------------------
    revno: 2220.1.35
    merged: pqm at pqm.ubuntu.com-20070201235951-11ed96907aa6bce4
    parent: pqm at pqm.ubuntu.com-20070201234808-3b1302d73474bd8c
    parent: john at arbash-meinel.com-20070201212919-s0s8iwvi8lowk0w0
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-02-01 23:59:51 +0000
    message:
      (John Arbash Meinel) Fix bug #82158: 'bzr annotate' should use dotted revnos from the Branch
        ------------------------------------------------------------
        revno: 2220.1.25.3.3
        merged: john at arbash-meinel.com-20070201212919-s0s8iwvi8lowk0w0
        parent: john at arbash-meinel.com-20070201163300-jp0cs02xz90leqpf
        parent: pqm at pqm.ubuntu.com-20070201203641-a125a85aee82c725
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: annotate_revnos
        timestamp: Thu 2007-02-01 15:29:19 -0600
        message:
          [merge] bzr.dev 2252
        ------------------------------------------------------------
        revno: 2220.1.25.3.2
        merged: john at arbash-meinel.com-20070201163300-jp0cs02xz90leqpf
        parent: john at arbash-meinel.com-20070129211128-hg0myfxd22jwg38t
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: annotate_revnos
        timestamp: Thu 2007-02-01 10:33:00 -0600
        message:
          Cleanup according to Wouter's suggestions.
        ------------------------------------------------------------
        revno: 2220.1.25.3.1
        merged: john at arbash-meinel.com-20070129211128-hg0myfxd22jwg38t
        parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: annotate_revnos
        timestamp: Mon 2007-01-29 15:11:28 -0600
        message:
          bzr annotate should use Branch's dotted revnos.
          Not the dotted revnos from the last modification of the file.
    ------------------------------------------------------------
    revno: 2220.1.34
    merged: pqm at pqm.ubuntu.com-20070201234808-3b1302d73474bd8c
    parent: pqm at pqm.ubuntu.com-20070201213634-0d00da7ab00bf788
    parent: abentley at panoramicfeedback.com-20070201203613-d2q6ngpvkt72ww5g
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-02-01 23:48:08 +0000
    message:
      Display changes made by revert
        ------------------------------------------------------------
        revno: 2220.1.5.1.6
        merged: abentley at panoramicfeedback.com-20070201203613-d2q6ngpvkt72ww5g
        parent: abentley at panoramicfeedback.com-20070201140415-trnf1722qqwj2pg4
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: revert
        timestamp: Thu 2007-02-01 15:36:13 -0500
        message:
          Update blackbox test
        ------------------------------------------------------------
        revno: 2220.1.5.1.5
        merged: abentley at panoramicfeedback.com-20070201140415-trnf1722qqwj2pg4
        parent: abentley at panoramicfeedback.com-20070110151219-52c5x0sp1qn04viv
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: revert
        timestamp: Thu 2007-02-01 09:04:15 -0500
        message:
          Clean up whitespace changes
        ------------------------------------------------------------
        revno: 2220.1.5.1.4
        merged: abentley at panoramicfeedback.com-20070110151219-52c5x0sp1qn04viv
        parent: abentley at panoramicfeedback.com-20070110150931-v46vbzmx0kfg5ggk
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: revert
        timestamp: Wed 2007-01-10 10:12:19 -0500
        message:
          PEP8 cleanup
        ------------------------------------------------------------
        revno: 2220.1.5.1.3
        merged: abentley at panoramicfeedback.com-20070110150931-v46vbzmx0kfg5ggk
        parent: abentley at panoramicfeedback.com-20070110150506-v9731hp13vdksj23
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: revert
        timestamp: Wed 2007-01-10 10:09:31 -0500
        message:
          change method names to assertFoo
        ------------------------------------------------------------
        revno: 2220.1.5.1.2
        merged: abentley at panoramicfeedback.com-20070110150506-v9731hp13vdksj23
        parent: abentley at panoramicfeedback.com-20070110140801-ixdm903ldjr4emik
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: revert
        timestamp: Wed 2007-01-10 10:05:06 -0500
        message:
          Ensure that changes are detected correctly
        ------------------------------------------------------------
        revno: 2220.1.5.1.1
        merged: abentley at panoramicfeedback.com-20070110140801-ixdm903ldjr4emik
        parent: pqm at pqm.ubuntu.com-20070105024018-b849a96645a25c39
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: revert
        timestamp: Wed 2007-01-10 09:08:01 -0500
        message:
          Added revert change display, with tests
    ------------------------------------------------------------
    revno: 2220.1.33
    merged: pqm at pqm.ubuntu.com-20070201213634-0d00da7ab00bf788
    parent: pqm at pqm.ubuntu.com-20070201203641-a125a85aee82c725
    parent: john at arbash-meinel.com-20070201154007-bnxh3uexaq659ad6
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-02-01 21:36:34 +0000
    message:
      (John Arbash Meinel) suggest using 'bzr pull' if merging into a branch with no commits.
        ------------------------------------------------------------
        revno: 2220.1.29.3.1
        merged: john at arbash-meinel.com-20070201154007-bnxh3uexaq659ad6
        parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: no-commits-errors
        timestamp: Thu 2007-02-01 09:40:07 -0600
        message:
          Mention using 'bzr pull' if there are no commits in current branch
    ------------------------------------------------------------
    revno: 2220.1.32
    merged: pqm at pqm.ubuntu.com-20070201203641-a125a85aee82c725
    parent: pqm at pqm.ubuntu.com-20070201202403-7e92ef4d6842ba85
    parent: john at arbash-meinel.com-20070201144953-d877vy9zbvxr5q98
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-02-01 20:36:41 +0000
    message:
      (John Arbash Meinel) hard-code the whitespace chars to avoid problems in some locales.
        ------------------------------------------------------------
        revno: 2220.1.29.2.1
        merged: john at arbash-meinel.com-20070201144953-d877vy9zbvxr5q98
        parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2007-02-01 08:49:53 -0600
        message:
          (John Arbash Meinel) hard-code the whitespace chars to avoid problems in some locales.
    ------------------------------------------------------------
    revno: 2220.1.31
    merged: pqm at pqm.ubuntu.com-20070201202403-7e92ef4d6842ba85
    parent: pqm at pqm.ubuntu.com-20070201175351-9ba49ec1a0744c97
    parent: abentley at panoramicfeedback.com-20070201145904-nrzbl3vkwjssrkhb
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-02-01 20:24:03 +0000
    message:
      Treat Permission Denied as a lock failure, not lock contention
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.4
        merged: abentley at panoramicfeedback.com-20070201145904-nrzbl3vkwjssrkhb
        parent: abentley at panoramicfeedback.com-20070131184912-1n4p0avc2qw5qyax
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Thu 2007-02-01 09:59:04 -0500
        message:
          Update to skip on win32
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.3
        merged: abentley at panoramicfeedback.com-20070131184912-1n4p0avc2qw5qyax
        parent: aaron.bentley at utoronto.ca-20070131035136-exu2pa898yr2gzen
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Wed 2007-01-31 13:49:12 -0500
        message:
          Lock attempts don't treat permission problems as lock contention
    ------------------------------------------------------------
    revno: 2220.1.30
    merged: pqm at pqm.ubuntu.com-20070201175351-9ba49ec1a0744c97
    parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
    parent: robertc at robertcollins.net-20070201171842-aw4059y8znmigwgn
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-02-01 17:53:51 +0000
    message:
      (robertc) Split branch pushing out of branch pulling.
        ------------------------------------------------------------
        revno: 2220.1.29.1.1
        merged: robertc at robertcollins.net-20070201171842-aw4059y8znmigwgn
        parent: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
        parent: robertc at robertcollins.net-20070130211105-u8p44qh31vsn4xh3
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Fri 2007-02-02 04:18:42 +1100
        message:
          (robertc) Split branch pushing out of branch pulling.
        ------------------------------------------------------------
        revno: 2220.1.25.2.3
        merged: robertc at robertcollins.net-20070130211105-u8p44qh31vsn4xh3
        parent: robertc at robertcollins.net-20070130210611-6ogb9vztebubsqyx
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: split-branch-pull
        timestamp: Wed 2007-01-31 08:11:05 +1100
        message:
          Add a NEWS entry.
        ------------------------------------------------------------
        revno: 2220.1.25.2.2
        merged: robertc at robertcollins.net-20070130210611-6ogb9vztebubsqyx
        parent: robertc at robertcollins.net-20070130205825-cagx4gvf17ioe2i5
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: split-branch-pull
        timestamp: Wed 2007-01-31 08:06:11 +1100
        message:
          Update cmd_push to invoke the correct 'push' method on branch, rather than pull. This does not alter tests because the behaviour for push and pull is still symmetrical.
        ------------------------------------------------------------
        revno: 2220.1.25.2.1
        merged: robertc at robertcollins.net-20070130205825-cagx4gvf17ioe2i5
        parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: split-branch-pull
        timestamp: Wed 2007-01-31 07:58:25 +1100
        message:
          Split branch pushing out of branch pulling.
    ------------------------------------------------------------
    revno: 2220.1.29
    merged: pqm at pqm.ubuntu.com-20070131184047-424584b0fabcee96
    parent: pqm at pqm.ubuntu.com-20070131165725-e3091cb8d282ef90
    parent: john at arbash-meinel.com-20070131174855-gxkjd9rvy17uc6ko
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-01-31 18:40:47 +0000
    message:
      (John Arbash Meinel) switch from looping over f.write() to f.writelines()
        ------------------------------------------------------------
        revno: 2220.1.27.1.2
        merged: john at arbash-meinel.com-20070131174855-gxkjd9rvy17uc6ko
        parent: john at arbash-meinel.com-20070131163348-kkwfh7hvvm39tx8y
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2007-01-31 11:48:55 -0600
        message:
          Switch from for line in foo: f.write(line) to f.writelines(foo)
    ------------------------------------------------------------
    revno: 2220.1.28
    merged: pqm at pqm.ubuntu.com-20070131165725-e3091cb8d282ef90
    parent: pqm at pqm.ubuntu.com-20070131140456-56881c31a01089a3
    parent: john at arbash-meinel.com-20070131163348-kkwfh7hvvm39tx8y
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-01-31 16:57:25 +0000
    message:
      fix --Derror => -Derror (trivial)
        ------------------------------------------------------------
        revno: 2220.1.27.1.1
        merged: john at arbash-meinel.com-20070131163348-kkwfh7hvvm39tx8y
        parent: pqm at pqm.ubuntu.com-20070131140456-56881c31a01089a3
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Wed 2007-01-31 10:33:48 -0600
        message:
          fix --Derror => -Derror (trivial)
    ------------------------------------------------------------
    revno: 2220.1.27
    merged: pqm at pqm.ubuntu.com-20070131140456-56881c31a01089a3
    parent: pqm at pqm.ubuntu.com-20070130211230-64c2d9b4bce9304f
    parent: aaron.bentley at utoronto.ca-20070131035136-exu2pa898yr2gzen
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-01-31 14:04:56 +0000
    message:
      Handle merge with dangling inventory entries
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.2
        merged: aaron.bentley at utoronto.ca-20070131035136-exu2pa898yr2gzen
        parent: aaron.bentley at utoronto.ca-20070131020421-a9fhra61hiwr0kcb
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Tue 2007-01-30 22:51:36 -0500
        message:
          Handle merge with dangling inventory entries
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31.1.1
        merged: aaron.bentley at utoronto.ca-20070131020421-a9fhra61hiwr0kcb
        parent: abentley at panoramicfeedback.com-20070111155749-v70rw01ug96bs1ll
        parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: Aaron's mergeable stuff
        timestamp: Tue 2007-01-30 21:04:21 -0500
        message:
          Merge bzr.dev
    ------------------------------------------------------------
    revno: 2220.1.26
    merged: pqm at pqm.ubuntu.com-20070130211230-64c2d9b4bce9304f
    parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
    parent: robertc at robertcollins.net-20070130115230-2052dzn5xo9h6o07
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-01-30 21:12:30 +0000
    message:
      (robertc) Add Branch hooks faciity, allowing clean creation and management of hooks around branch API calls.
        ------------------------------------------------------------
        revno: 2220.1.25.1.3
        merged: robertc at robertcollins.net-20070130115230-2052dzn5xo9h6o07
        parent: robertc at robertcollins.net-20070130104104-wsikhrgretspg86m
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: branch-hook
        timestamp: Tue 2007-01-30 22:52:30 +1100
        message:
          Add install_hook to the BranchHooks class as the official means for installing a hook.
        ------------------------------------------------------------
        revno: 2220.1.25.1.2
        merged: robertc at robertcollins.net-20070130104104-wsikhrgretspg86m
        parent: robertc at robertcollins.net-20070129165849-409f5714fa7ebe48
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: branch-hook
        timestamp: Tue 2007-01-30 21:41:04 +1100
        message:
          Remove the static DefaultHooks method from Branch, replacing it with a derived dict BranchHooks object, which is easier to use and provides a place to put the policy-checking add method discussed on list.
        ------------------------------------------------------------
        revno: 2220.1.25.1.1
        merged: robertc at robertcollins.net-20070129165849-409f5714fa7ebe48
        parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: branch-hook
        timestamp: Tue 2007-01-30 03:58:49 +1100
        message:
          New Branch hooks facility, with one initial hook 'set_rh' which triggers
          whenever the revision history is set. This allows triggering on e.g.
          push, pull, commit, and so on. Developed for use with the branchrss
          plugin. See bzrlib/tests/branch_implementations/test_hooks for more
          details. (Robert Collins)
    ------------------------------------------------------------
    revno: 2220.1.25
    merged: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
    parent: pqm at pqm.ubuntu.com-20070125051817-53a80525dbdf87b4
    parent: john at arbash-meinel.com-20070125155429-x53892xqx4r17l8h
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-01-25 19:46:26 +0000
    message:
      (John Arbash Meinel) (r=Martin) Improve the read/write_lock decorators to create custom functions for better profiling and documentation.
        ------------------------------------------------------------
        revno: 2220.1.10.2.6
        merged: john at arbash-meinel.com-20070125155429-x53892xqx4r17l8h
        parent: john at arbash-meinel.com-20070124204020-szyxbjpn9mzbsks7
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: decorators
        timestamp: Thu 2007-01-25 09:54:29 -0600
        message:
          Clean up the documentation and imports for decorators (per Martin's suggestions)
        ------------------------------------------------------------
        revno: 2220.1.10.2.5
        merged: john at arbash-meinel.com-20070124204020-szyxbjpn9mzbsks7
        parent: john at arbash-meinel.com-20070124175950-jsf09jr7wq3u1neb
        parent: pqm at pqm.ubuntu.com-20070124170602-5f008e922b3dd800
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: decorators
        timestamp: Wed 2007-01-24 14:40:20 -0600
        message:
          [merge] bzr.dev 2242
        ------------------------------------------------------------
        revno: 2220.1.10.2.4
        merged: john at arbash-meinel.com-20070124175950-jsf09jr7wq3u1neb
        parent: john at arbash-meinel.com-20070124173401-dstdatq52iz8fi1m
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: decorators
        timestamp: Wed 2007-01-24 11:59:50 -0600
        message:
          Add tests that decorators generate useful wrappers.
        ------------------------------------------------------------
        revno: 2220.1.10.2.3
        merged: john at arbash-meinel.com-20070124173401-dstdatq52iz8fi1m
        parent: john at arbash-meinel.com-20070112002700-uvutedw5kko38zsp
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: decorators
        timestamp: Wed 2007-01-24 11:34:01 -0600
        message:
          Add the ability to have fast decorators as well as pretty ones, and have 'bzr' select the right one at startup.
        ------------------------------------------------------------
        revno: 2220.1.10.2.2
        merged: john at arbash-meinel.com-20070112002700-uvutedw5kko38zsp
        parent: john at arbash-meinel.com-20070111224224-kj9t3nmsmpphnp2e
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: decorators
        timestamp: Thu 2007-01-11 18:27:00 -0600
        message:
          Change decorators to define the same parameters as the wrapped func.
          
          This should make it easier to use help(bzrlib.Branch.foo) since you see the
          real parameters, rather than *args, **kwargs.
        ------------------------------------------------------------
        revno: 2220.1.10.2.1
        merged: john at arbash-meinel.com-20070111224224-kj9t3nmsmpphnp2e
        parent: pqm at pqm.ubuntu.com-20070111161229-759760c90ec737e6
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: decorators
        timestamp: Thu 2007-01-11 16:42:24 -0600
        message:
          Change the read_lock and write_lock decorators to use custom names
    ------------------------------------------------------------
    revno: 2220.1.24
    merged: pqm at pqm.ubuntu.com-20070125051817-53a80525dbdf87b4
    parent: pqm at pqm.ubuntu.com-20070124225848-73ee49f6aeb7ea18
    parent: mbp at sourcefrog.net-20070125003522-27pc5240qbqtzfy3
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-01-25 05:18:17 +0000
    message:
      (mbp) Change RepositoryFormat to use a registry (r=john)
        ------------------------------------------------------------
        revno: 2220.1.21.1.3
        merged: mbp at sourcefrog.net-20070125003522-27pc5240qbqtzfy3
        parent: mbp at sourcefrog.net-20070124112017-mp52x60whw4llr43
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: repoformats
        timestamp: Thu 2007-01-25 11:35:22 +1100
        message:
          Remove Registry.itervalues (comment from john)
        ------------------------------------------------------------
        revno: 2220.1.21.1.2
        merged: mbp at sourcefrog.net-20070124112017-mp52x60whw4llr43
        parent: mbp at sourcefrog.net-20070124071209-yqiths20n6wxqaqr
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: repoformats
        timestamp: Wed 2007-01-24 22:20:17 +1100
        message:
          change to using external Repository format registry
        ------------------------------------------------------------
        revno: 2220.1.21.1.1
        merged: mbp at sourcefrog.net-20070124071209-yqiths20n6wxqaqr
        parent: pqm at pqm.ubuntu.com-20070120020104-a192555a9165b259
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: repoformats
        timestamp: Wed 2007-01-24 18:12:09 +1100
        message:
          Change RepositoryFormat to use a Registry rather than ad-hoc dictionary
    ------------------------------------------------------------
    revno: 2220.1.23
    merged: pqm at pqm.ubuntu.com-20070124225848-73ee49f6aeb7ea18
    parent: pqm at pqm.ubuntu.com-20070124170602-5f008e922b3dd800
    parent: bialix at ukr.net-20070124194226-rl1rlatr3jc5cvhh
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-01-24 22:58:48 +0000
    message:
      merge from bzr.0.14 branch
        ------------------------------------------------------------
        revno: 2220.1.22.1.1
        merged: bialix at ukr.net-20070124194226-rl1rlatr3jc5cvhh
        parent: pqm at pqm.ubuntu.com-20070124170602-5f008e922b3dd800
        parent: pqm at pqm.ubuntu.com-20070118233247-d98daa44090c3cc9
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: bzr.dev.plus.0.14
        timestamp: Wed 2007-01-24 21:42:26 +0200
        message:
          merge latest fixes from bzr.0.14
        ------------------------------------------------------------
        revno: 2220.1.14.2.5
        merged: pqm at pqm.ubuntu.com-20070118233247-d98daa44090c3cc9
        parent: pqm at pqm.ubuntu.com-20070118221722-c7dcb4be26d85c5e
        parent: larstiq at larstiq.dyndns.org-20070118232016-7xx7u7w3tile8m6x
        committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
        branch nick: 0.14
        timestamp: Thu 2007-01-18 23:32:47 +0000
        message:
          (James Westby) Handle bzr residing in a non-workingtree nested in a repository (#77306)
            ------------------------------------------------------------
            revno: 2220.1.14.2.4.1.1
            merged: larstiq at larstiq.dyndns.org-20070118232016-7xx7u7w3tile8m6x
            parent: pqm at pqm.ubuntu.com-20070118221722-c7dcb4be26d85c5e
            committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
            branch nick: bzr.0.14
            timestamp: Fri 2007-01-19 00:20:16 +0100
            message:
              (James Westby) Handle bzr residing in a non-workingtree nested in a repository (#77306)
        ------------------------------------------------------------
        revno: 2220.1.14.2.4
        merged: pqm at pqm.ubuntu.com-20070118221722-c7dcb4be26d85c5e
        parent: pqm at pqm.ubuntu.com-20070118190507-040a648161f0a8be
        parent: larstiq at larstiq.dyndns.org-20070118202912-g3fi76wqbxr582q2
        committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
        branch nick: 0.14
        timestamp: Thu 2007-01-18 22:17:22 +0000
        message:
          (Aaron Bentley) Document global options
            ------------------------------------------------------------
            revno: 2220.1.14.2.3.1.1
            merged: larstiq at larstiq.dyndns.org-20070118202912-g3fi76wqbxr582q2
            parent: pqm at pqm.ubuntu.com-20070118190507-040a648161f0a8be
            parent: abentley at panoramicfeedback.com-20070115150638-jvpe348rvjd5rjz4
            committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
            branch nick: bzr.0.14
            timestamp: Thu 2007-01-18 21:29:12 +0100
            message:
              (Aaron Bentley) Document global options
        ------------------------------------------------------------
        revno: 2220.1.14.2.3
        merged: pqm at pqm.ubuntu.com-20070118190507-040a648161f0a8be
        parent: pqm at pqm.ubuntu.com-20070118171806-ba4237dcc3934b6a
        parent: larstiq at larstiq.dyndns.org-20070118183721-78uzxifyyyoqxja9
        committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
        branch nick: 0.14
        timestamp: Thu 2007-01-18 19:05:07 +0000
        message:
          (Wouter van Heyst) Update mailing list address.
            ------------------------------------------------------------
            revno: 2220.1.14.2.2.1.2
            merged: larstiq at larstiq.dyndns.org-20070118183721-78uzxifyyyoqxja9
            parent: larstiq at larstiq.dyndns.org-20070118182201-g9fuw9pr294wejas
            committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
            branch nick: bzr.0.14
            timestamp: Thu 2007-01-18 19:37:21 +0100
            message:
              (Alexander Belchenko) add windows installer check for python2.5
            ------------------------------------------------------------
            revno: 2220.1.14.2.2.1.1
            merged: larstiq at larstiq.dyndns.org-20070118182201-g9fuw9pr294wejas
            parent: pqm at pqm.ubuntu.com-20070118171806-ba4237dcc3934b6a
            committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
            branch nick: bzr.0.14
            timestamp: Thu 2007-01-18 19:22:01 +0100
            message:
              Update the mailing list address.
        ------------------------------------------------------------
        revno: 2220.1.14.2.2
        merged: pqm at pqm.ubuntu.com-20070118171806-ba4237dcc3934b6a
        parent: pqm at pqm.ubuntu.com-20070116154606-2655dbb8d795e4b2
        parent: larstiq at larstiq.dyndns.org-20070118162615-gq7v7gpkhhprg6ah
        committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
        branch nick: 0.14
        timestamp: Thu 2007-01-18 17:18:06 +0000
        message:
          (John Arbash Meinel) Fix selftest for installed bzr (#80330)
            ------------------------------------------------------------
            revno: 2220.1.14.2.1.1.1
            merged: larstiq at larstiq.dyndns.org-20070118162615-gq7v7gpkhhprg6ah
            parent: pqm at pqm.ubuntu.com-20070116154606-2655dbb8d795e4b2
            parent: juju at arbash-meinel.com-20070118144908-872rgajafdmzjpm7
            committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
            branch nick: bzr.0.14
            timestamp: Thu 2007-01-18 17:26:15 +0100
            message:
              (John Arbash Meinel) Fix selftest for installed bzr (#80330)
            ------------------------------------------------------------
            revno: 2220.1.9.1.2
            merged: juju at arbash-meinel.com-20070118144908-872rgajafdmzjpm7
            parent: john at arbash-meinel.com-20070111155741-ytnaog8q1mwz71u6
            committer: جاون عرباش ماينل <juju at arbash-meinel.com>
            branch nick: jam-integration
            timestamp: Thu 2007-01-18 08:49:08 -0600
            message:
              Allow tests to skip after installation, since certain packages will not be available.
        ------------------------------------------------------------
        revno: 2220.1.14.2.1
        merged: pqm at pqm.ubuntu.com-20070116154606-2655dbb8d795e4b2
        parent: pqm at pqm.ubuntu.com-20070115033134-6f456e8e9cc87f35
        parent: larstiq at larstiq.dyndns.org-20070116152827-m5as55u075hv4z5m
        committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
        branch nick: 0.14
        timestamp: Tue 2007-01-16 15:46:06 +0000
        message:
          (Wouter van Heyst) Release 0.14rc1
        ------------------------------------------------------------
        revno: 2220.1.14.3.1
        merged: larstiq at larstiq.dyndns.org-20070116152827-m5as55u075hv4z5m
        parent: pqm at pqm.ubuntu.com-20070115033134-6f456e8e9cc87f35
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: bzr.0.14
        timestamp: Tue 2007-01-16 16:28:27 +0100
        message:
          Release 0.14rc1
    ------------------------------------------------------------
    revno: 2220.1.22
    merged: pqm at pqm.ubuntu.com-20070124170602-5f008e922b3dd800
    parent: pqm at pqm.ubuntu.com-20070120020104-a192555a9165b259
    parent: bialix at ukr.net-20070124130332-ane2eqz3eqrtm9u1
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-01-24 17:06:02 +0000
    message:
      (bialix) 'bzr missing' show remembered location unescaped,and show
       file URL as filepath not a URL.
        ------------------------------------------------------------
        revno: 2193.4.3
        merged: bialix at ukr.net-20070124130332-ane2eqz3eqrtm9u1
        parent: bialix at ukr.net-20070124104508-mwiux3wozhk8939k
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: miss.last-file-location
        timestamp: Wed 2007-01-24 15:03:32 +0200
        message:
          Use new API for testing
        ------------------------------------------------------------
        revno: 2193.4.2
        merged: bialix at ukr.net-20070124104508-mwiux3wozhk8939k
        parent: bialix at ukr.net-20061218122151-mzm4bgx34y0qetpx
        parent: pqm at pqm.ubuntu.com-20070117020432-338f7296818dc56e
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: miss.last-file-location
        timestamp: Wed 2007-01-24 12:45:08 +0200
        message:
          merge bzr.dev
        ------------------------------------------------------------
        revno: 2193.4.1
        merged: bialix at ukr.net-20061218122151-mzm4bgx34y0qetpx
        parent: pqm at pqm.ubuntu.com-20061217195527-29196a8633600671
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: miss.last-file-location
        timestamp: Mon 2006-12-18 14:21:51 +0200
        message:
          'bzr missing' without specifying location show remembered location unescaped
          and show file URL as filepath not a URL.
    ------------------------------------------------------------
    revno: 2220.1.21
    merged: pqm at pqm.ubuntu.com-20070120020104-a192555a9165b259
    parent: pqm at pqm.ubuntu.com-20070117184107-a6267599a6b636f1
    parent: aaron.bentley at utoronto.ca-20070120014446-2znre037lrj823cd
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2007-01-20 02:01:04 +0000
    message:
      mv can also work on just inventory entry (Eichenberg, Kruger)
        ------------------------------------------------------------
        revno: 2220.2.14
        merged: aaron.bentley at utoronto.ca-20070120014446-2znre037lrj823cd
        parent: amanic at gmail.com-20070119194219-mlzsauq30x2az9sq
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: bzr.ab.integration
        timestamp: Fri 2007-01-19 20:44:46 -0500
        message:
          Cleanup formatting and error handling
        ------------------------------------------------------------
        revno: 2220.2.13
        merged: amanic at gmail.com-20070119194219-mlzsauq30x2az9sq
        parent: amanic at gmail.com-20070119192353-i96mfa4bsya9thdu
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.enhanced_move
        timestamp: Fri 2007-01-19 21:42:19 +0200
        message:
          Remove assertNone
        ------------------------------------------------------------
        revno: 2220.2.12
        merged: amanic at gmail.com-20070119192353-i96mfa4bsya9thdu
        parent: amanic at gmail.com-20070119094738-zzjsna2p0lupx92a
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.enhanced_move
        timestamp: Fri 2007-01-19 21:23:53 +0200
        message:
          * Fix errors.py import order
          * Atemt to handle exceptions better in WorkingTree._move
        ------------------------------------------------------------
        revno: 2220.2.11
        merged: amanic at gmail.com-20070119094738-zzjsna2p0lupx92a
        parent: amanic at gmail.com-20070118041151-m5kjsutaymhy8yoy
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.enhanced_move
        timestamp: Fri 2007-01-19 11:47:38 +0200
        message:
          * bzrlib/errors.py
            Changed "FilesExist" to more specific "RenameFailedFilesExist"
        ------------------------------------------------------------
        revno: 2220.2.10
        merged: amanic at gmail.com-20070118041151-m5kjsutaymhy8yoy
        parent: amanic at gmail.com-20070111180203-nu4s7rbxemd3l50u
        parent: pqm at pqm.ubuntu.com-20070117184107-a6267599a6b636f1
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.enhanced_move
        timestamp: Thu 2007-01-18 06:11:51 +0200
        message:
          merge bzr.dev
        ------------------------------------------------------------
        revno: 2220.2.9
        merged: amanic at gmail.com-20070111180203-nu4s7rbxemd3l50u
        parent: amanic at gmail.com-20070111173532-5v3z2qfi35f9cd44
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.enhanced_move2
        timestamp: Thu 2007-01-11 20:02:03 +0200
        message:
          Remove all trailing white space this bundle would have
          added. Fix wrong Bazaar version reference.
        ------------------------------------------------------------
        revno: 2220.2.8
        merged: amanic at gmail.com-20070111173532-5v3z2qfi35f9cd44
        parent: amanic at gmail.com-20070111165531-ai82lgbvb8wy5bwq
        parent: pqm at pqm.ubuntu.com-20070111161229-759760c90ec737e6
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.enhanced_move2
        timestamp: Thu 2007-01-11 19:35:32 +0200
        message:
          merge bzr.dev
        ------------------------------------------------------------
        revno: 2220.2.7
        merged: amanic at gmail.com-20070111165531-ai82lgbvb8wy5bwq
        parent: amanic at gmail.com-20070111124417-34qobd08gvz0vo0n
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.enhanced_move
        timestamp: Thu 2007-01-11 18:55:31 +0200
        message:
          update NEWS
        ------------------------------------------------------------
        revno: 2220.2.6
        merged: amanic at gmail.com-20070111124417-34qobd08gvz0vo0n
        parent: amanic at gmail.com-20070111062048-e0hcas0zqt1hmrd8
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.enhanced_move
        timestamp: Thu 2007-01-11 14:44:17 +0200
        message:
          * change error message telling user about --after option sightly
          * change long line to rather use temp variable
          * change expected version this will be introduced to 0.15
          * remove comma again
          * remove comment which we don't understand
        ------------------------------------------------------------
        revno: 2220.2.5
        merged: amanic at gmail.com-20070111062048-e0hcas0zqt1hmrd8
        parent: amanic at gmail.com-20070111061415-waq22luaja5czdry
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.enhanced_move
        timestamp: Thu 2007-01-11 08:20:48 +0200
        message:
          * bzrlib/tests/blackbox/test_mv.py
            - add utility methods and use them where appropriate:
              assertInWorkingTree, assertNotInWorkingTree and assertMoved
            - fix each doc string to have a one-liner and a longer description
            - remove commits
            - update tests to follow the use case being tested more closely.
        ------------------------------------------------------------
        revno: 2220.2.4
        merged: amanic at gmail.com-20070111061415-waq22luaja5czdry
        parent: amanic at gmail.com-20070104033937-6ba6mnsnl8d4ja4f
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.enhanced_move
        timestamp: Thu 2007-01-11 08:14:15 +0200
        message:
          * bzrlib/tests/__init__
            - add utility assert methods: assertNone and assertNotNone
            - failUnlessExists and failIfExists give beter messages when failing
        ------------------------------------------------------------
        revno: 2220.2.3
        merged: amanic at gmail.com-20070104033937-6ba6mnsnl8d4ja4f
        parent: amanic at gmail.com-20070103062231-f67a7q1hyahha84m
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.enhanced_move
        timestamp: Thu 2007-01-04 05:39:37 +0200
        message:
          * errors.py
            - fix copy paste err.
            - make DirectoryNotEmpty constructor parameters optional.
        ------------------------------------------------------------
        revno: 2220.2.2
        merged: amanic at gmail.com-20070103062231-f67a7q1hyahha84m
        parent: amanic at gmail.com-20070103061443-i6kogbeqb54148p9
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.enhanced_move
        timestamp: Wed 2007-01-03 08:22:31 +0200
        message:
          Undo accidental changes: some files were made executable.
        ------------------------------------------------------------
        revno: 2220.2.1
        merged: amanic at gmail.com-20070103061443-i6kogbeqb54148p9
        parent: pqm at pqm.ubuntu.com-20070103022432-334b367262bc7407
        parent: amanic at gmail.com-20061222184022-8td58r6xtt9jodnn
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.enhanced_move
        timestamp: Wed 2007-01-03 08:14:43 +0200
        message:
          merge enhancedmv3.patch with bzr.dev
        ------------------------------------------------------------
        revno: 2206.1.10
        merged: amanic at gmail.com-20061222184022-8td58r6xtt9jodnn
        parent: amanic at gmail.com-20061222182250-mq33oq8fs45fx4sb
        parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.enhanced_move
        timestamp: Fri 2006-12-22 20:40:22 +0200
        message:
          merge bzr.dev
        ------------------------------------------------------------
        revno: 2206.1.9
        merged: amanic at gmail.com-20061222182250-mq33oq8fs45fx4sb
        parent: amanic at gmail.com-20061222164938-rbjxiq858d78k5lw
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.enhanced_move
        timestamp: Fri 2006-12-22 20:22:50 +0200
        message:
          * Change move/rename errors yet again
            - added new exception classes BzrMoveFailedError and BzrRenameFailedError
            - convert the move/rename methods to raise these new exceptions,
              and pass more specefic exceptions as extra.
        ------------------------------------------------------------
        revno: 2206.1.8
        merged: amanic at gmail.com-20061222164938-rbjxiq858d78k5lw
        parent: amanic at gmail.com-20061222060404-49pvclo8t1v8eiyx
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.enhanced_move
        timestamp: Fri 2006-12-22 18:49:38 +0200
        message:
          Converted move/rename error messages to show source => target.
        ------------------------------------------------------------
        revno: 2206.1.7
        merged: amanic at gmail.com-20061222060404-49pvclo8t1v8eiyx
        parent: marius.kruger at enerweb.co.za-20061221191535-wtl0drt01e8uv1v1
        committer: Marius Kruger <amanic at gmail.com>
        branch nick: bzr.enhanced_move
        timestamp: Fri 2006-12-22 08:04:04 +0200
        message:
          * errors
            - change comments to doc-strings
            - Make FilesExist handle plurals properly for 1 or more files
            - change contextInfo to context_info
          * test_mv
            - apply error message suggestions
          * workingtree
            - remov old style error imports
            - fix some long lines
        ------------------------------------------------------------
        revno: 2206.1.6
        merged: marius.kruger at enerweb.co.za-20061221191535-wtl0drt01e8uv1v1
        parent: marius.kruger at enerweb.co.za-20061221191435-3y22jy8raa6959yk
        parent: pqm at pqm.ubuntu.com-20061221163807-07adb2b67c60b6e6
        committer: Marius Kruger <marius.kruger at enerweb.co.za>
        branch nick: bzr.enhanced_move
        timestamp: Thu 2006-12-21 21:15:35 +0200
        message:
          merge bzr.dev
        ------------------------------------------------------------
        revno: 2206.1.5
        merged: marius.kruger at enerweb.co.za-20061221191435-3y22jy8raa6959yk
        parent: marius.kruger at enerweb.co.za-20061221180752-twd4soiaglxi3ofj
        committer: Marius Kruger <marius.kruger at enerweb.co.za>
        branch nick: bzr.enhanced_move
        timestamp: Thu 2006-12-21 21:14:35 +0200
        message:
          * errors
            - Add AlreadyVersionedError
            - Fix type
            - Add 'extra' capability to PathsDoNotExist.
          * update test_mv
          * workingtre
            - Convert more BzrErrors to mores specialised ones.
        ------------------------------------------------------------
        revno: 2206.1.4
        merged: marius.kruger at enerweb.co.za-20061221180752-twd4soiaglxi3ofj
        parent: marius.kruger at enerweb.co.za-20061221171344-umbd2lgx2xd9yktu
        committer: Marius Kruger <marius.kruger at enerweb.co.za>
        branch nick: bzr.enhanced_move
        timestamp: Thu 2006-12-21 20:07:52 +0200
        message:
          Improved WorkingTree.move excptions. (as requested)
        ------------------------------------------------------------
        revno: 2206.1.3
        merged: marius.kruger at enerweb.co.za-20061221171344-umbd2lgx2xd9yktu
        parent: marius.kruger at enerweb.co.za-20061221163659-12noae60x2pkz20b
        committer: Marius Kruger <marius.kruger at enerweb.co.za>
        branch nick: bzr.enhanced_move
        timestamp: Thu 2006-12-21 19:13:44 +0200
        message:
          * workingtree
            - Removed redundant setter method.
            - Improved capitalization, and punctuation (as requested).
        ------------------------------------------------------------
        revno: 2206.1.2
        merged: marius.kruger at enerweb.co.za-20061221163659-12noae60x2pkz20b
        parent: marius.kruger at enerweb.co.za-20061221051149-9ghc9jjj79899dr3
        committer: Marius Kruger <marius.kruger at enerweb.co.za>
        branch nick: bzr.enhanced_move
        timestamp: Thu 2006-12-21 18:36:59 +0200
        message:
          * Made whitespace and puntuation improvements, as requested.
          * Improved NotVersionedError in order to show context
          * Updated test_mv to pass again after changes
          * Use proper exception when move destination is invalid.
        ------------------------------------------------------------
        revno: 2206.1.1
        merged: marius.kruger at enerweb.co.za-20061221051149-9ghc9jjj79899dr3
        parent: pqm at pqm.ubuntu.com-20061220185255-86cd0a40a9c2e76e
        parent: scameronde at googlemail.com-20061113085356-579f0c2a1c06ea79
        committer: Marius Kruger <marius.kruger at enerweb.co.za>
        branch nick: bzr.enhanced_move
        timestamp: Thu 2006-12-21 07:11:49 +0200
        message:
          merge initial enhancedmv.patch
        ------------------------------------------------------------
        revno: 2123.3.10
        merged: scameronde at googlemail.com-20061113085356-579f0c2a1c06ea79
        parent: scameronde at googlemail.com-20061113084737-6d184e0e1527168d
        parent: pqm at pqm.ubuntu.com-20061111170313-7046f63cb736a63f
        committer: Steffen Eichenberg <scameronde at googlemail.com>
        branch nick: bzr.mvdev
        timestamp: Mon 2006-11-13 09:53:56 +0100
        message:
          merged main development branch
        ------------------------------------------------------------
        revno: 2123.3.9
        merged: scameronde at googlemail.com-20061113084737-6d184e0e1527168d
        parent: scameronde at googlemail.com-20061113084654-f6b185863d289320
        committer: Steffen Eichenberg <scameronde at googlemail.com>
        branch nick: bzr.mvdev
        timestamp: Mon 2006-11-13 09:47:37 +0100
        message:
          added tests for deprecated API workingtree.move
        ------------------------------------------------------------
        revno: 2123.3.8
        merged: scameronde at googlemail.com-20061113084654-f6b185863d289320
        parent: scameronde at googlemail.com-20061108154710-5c1b0731ddb9365e
        committer: Steffen Eichenberg <scameronde at googlemail.com>
        branch nick: bzr.mvdev
        timestamp: Mon 2006-11-13 09:46:54 +0100
        message:
          new parameter to_dir must be a named parameter
        ------------------------------------------------------------
        revno: 2123.3.7
        merged: scameronde at googlemail.com-20061108154710-5c1b0731ddb9365e
        parent: scameronde at googlemail.com-20061108154617-4f8049877e9e83f6
        committer: Steffen Eichenberg <scameronde at googlemail.com>
        branch nick: bzr.mvdev
        timestamp: Wed 2006-11-08 16:47:10 +0100
        message:
          split tests so that each new method contains one test only
        ------------------------------------------------------------
        revno: 2123.3.6
        merged: scameronde at googlemail.com-20061108154617-4f8049877e9e83f6
        parent: scameronde at googlemail.com-20061108154558-21af1c09054ba825
        committer: Steffen Eichenberg <scameronde at googlemail.com>
        branch nick: bzr.mvdev
        timestamp: Wed 2006-11-08 16:46:17 +0100
        message:
          unified error messages
        ------------------------------------------------------------
        revno: 2123.3.5
        merged: scameronde at googlemail.com-20061108154558-21af1c09054ba825
        parent: scameronde at googlemail.com-20061107162812-0bea1e610c10e282
        committer: Steffen Eichenberg <scameronde at googlemail.com>
        branch nick: bzr.mvdev
        timestamp: Wed 2006-11-08 16:45:58 +0100
        message:
          specifying named parameters
        ------------------------------------------------------------
        revno: 2123.3.4
        merged: scameronde at googlemail.com-20061107162812-0bea1e610c10e282
        parent: scameronde at googlemail.com-20061107162703-197cfbc1391e59fe
        committer: Steffen Eichenberg <scameronde at googlemail.com>
        branch nick: bzr.mvdev
        timestamp: Tue 2006-11-07 17:28:12 +0100
        message:
          a few new blackbox test for mv
        ------------------------------------------------------------
        revno: 2123.3.3
        merged: scameronde at googlemail.com-20061107162703-197cfbc1391e59fe
        parent: scameronde at googlemail.com-20061107150900-80887acd23f7b691
        committer: Steffen Eichenberg <scameronde at googlemail.com>
        branch nick: bzr.mvdev
        timestamp: Tue 2006-11-07 17:27:03 +0100
        message:
          fixed wrong formatting of error text
        ------------------------------------------------------------
        revno: 2123.3.2
        merged: scameronde at googlemail.com-20061107150900-80887acd23f7b691
        parent: scameronde at googlemail.com-20061107144652-d7553603b5e0a6c7
        committer: Steffen Eichenberg <scameronde at googlemail.com>
        branch nick: bzr.mvdev
        timestamp: Tue 2006-11-07 16:09:00 +0100
        message:
          fixed the most obvious bugs
        ------------------------------------------------------------
        revno: 2123.3.1
        merged: scameronde at googlemail.com-20061107144652-d7553603b5e0a6c7
        parent: pqm at pqm.ubuntu.com-20061107050730-c5133c11a1b1efc1
        committer: Steffen Eichenberg <scameronde at googlemail.com>
        branch nick: bzr.mvdev
        timestamp: Tue 2006-11-07 15:46:52 +0100
        message:
          the mv command is now able to move files that have already been moved on the file system
    ------------------------------------------------------------
    revno: 2220.1.20
    merged: pqm at pqm.ubuntu.com-20070117184107-a6267599a6b636f1
    parent: pqm at pqm.ubuntu.com-20070117172114-dc75493dad46088c
    parent: abentley at panoramicfeedback.com-20070117163240-lj6ttc8m57mdrsj0
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-01-17 18:41:07 +0000
    message:
      Add RegistryOption, use for directory format
        ------------------------------------------------------------
        revno: 2220.1.1.4.9
        merged: abentley at panoramicfeedback.com-20070117163240-lj6ttc8m57mdrsj0
        parent: abentley at panoramicfeedback.com-20070117161350-z0poe4762mzt2mlb
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: registryoption
        timestamp: Wed 2007-01-17 11:32:40 -0500
        message:
          Zap trailing whitespace
        ------------------------------------------------------------
        revno: 2220.1.1.4.8
        merged: abentley at panoramicfeedback.com-20070117161350-z0poe4762mzt2mlb
        parent: abentley at panoramicfeedback.com-20070109151918-cs36mdp2wrjnn3ax
        parent: pqm at pqm.ubuntu.com-20070117020432-338f7296818dc56e
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: registryoption
        timestamp: Wed 2007-01-17 11:13:50 -0500
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        revno: 2220.1.1.4.7
        merged: abentley at panoramicfeedback.com-20070109151918-cs36mdp2wrjnn3ax
        parent: abentley at panoramicfeedback.com-20070109151248-nmc1xu326dp8g3u4
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: registryoption
        timestamp: Tue 2007-01-09 10:19:18 -0500
        message:
          Add suggestion to HACKING
        ------------------------------------------------------------
        revno: 2220.1.1.4.6
        merged: abentley at panoramicfeedback.com-20070109151248-nmc1xu326dp8g3u4
        parent: abentley at panoramicfeedback.com-20070105231534-t9q8x3c9es2atc00
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: registryoption
        timestamp: Tue 2007-01-09 10:12:48 -0500
        message:
          Improve text and naming
        ------------------------------------------------------------
        revno: 2220.1.1.4.5
        merged: abentley at panoramicfeedback.com-20070105231534-t9q8x3c9es2atc00
        parent: abentley at panoramicfeedback.com-20070105225002-cy0t8kpee9gg6svx
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: registryoption
        timestamp: Fri 2007-01-05 18:15:34 -0500
        message:
          Switch to RegistryOption for upgrade and init-repository
        ------------------------------------------------------------
        revno: 2220.1.1.4.4
        merged: abentley at panoramicfeedback.com-20070105225002-cy0t8kpee9gg6svx
        parent: abentley at panoramicfeedback.com-20070105221746-wgea5m9nebj16rmo
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: registryoption
        timestamp: Fri 2007-01-05 17:50:02 -0500
        message:
          Fix iter_switches behavior when value_switches is true
        ------------------------------------------------------------
        revno: 2220.1.1.4.3
        merged: abentley at panoramicfeedback.com-20070105221746-wgea5m9nebj16rmo
        parent: abentley at panoramicfeedback.com-20070105215821-nur051ztenymnrrr
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: registryoption
        timestamp: Fri 2007-01-05 17:17:46 -0500
        message:
          Add docstrings
        ------------------------------------------------------------
        revno: 2220.1.1.4.2
        merged: abentley at panoramicfeedback.com-20070105215821-nur051ztenymnrrr
        parent: abentley at panoramicfeedback.com-20070105212429-t77373aek2v2nuvh
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: registryoption
        timestamp: Fri 2007-01-05 16:58:21 -0500
        message:
          Implement RegistryOption on init
        ------------------------------------------------------------
        revno: 2220.1.1.4.1
        merged: abentley at panoramicfeedback.com-20070105212429-t77373aek2v2nuvh
        parent: pqm at pqm.ubuntu.com-20070103073947-f9906c0b1f425aa9
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: registryoption
        timestamp: Fri 2007-01-05 16:24:29 -0500
        message:
          Get registry options working
    ------------------------------------------------------------
    revno: 2220.1.19
    merged: pqm at pqm.ubuntu.com-20070117172114-dc75493dad46088c
    parent: pqm at pqm.ubuntu.com-20070117162220-c8e98cc6eec6ed27
    parent: abentley at panoramicfeedback.com-20070117154008-rhepzwccochg3mmh
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-01-17 17:21:14 +0000
    message:
      Ensure reserved ids are never stored
        ------------------------------------------------------------
        revno: 2220.1.9.2.5
        merged: abentley at panoramicfeedback.com-20070117154008-rhepzwccochg3mmh
        parent: abentley at panoramicfeedback.com-20070117153921-6pp9ssa2r8n5izoo
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: reserved-ids
        timestamp: Wed 2007-01-17 10:40:08 -0500
        message:
          Move NEWS to appropriate section
        ------------------------------------------------------------
        revno: 2220.1.9.2.4
        merged: abentley at panoramicfeedback.com-20070117153921-6pp9ssa2r8n5izoo
        parent: abentley at panoramicfeedback.com-20070117153708-4jni0ycaitv7xgra
        parent: abentley at panoramicfeedback.com-20070117144846-7ql2d2433v28cbwy
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: reserved-ids
        timestamp: Wed 2007-01-17 10:39:21 -0500
        message:
          Merge bzr.ab, to avoid conflicts submitting
        ------------------------------------------------------------
        revno: 2220.1.9.2.3
        merged: abentley at panoramicfeedback.com-20070117153708-4jni0ycaitv7xgra
        parent: abentley at panoramicfeedback.com-20070111175909-40z7nyaogn9rs6gr
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: reserved-ids
        timestamp: Wed 2007-01-17 10:37:08 -0500
        message:
          change reserved_id to is_reserved_id, add check_not_reserved for DRY
        ------------------------------------------------------------
        revno: 2220.1.9.2.2
        merged: abentley at panoramicfeedback.com-20070111175909-40z7nyaogn9rs6gr
        parent: abentley at panoramicfeedback.com-20070111172025-8rnvvm3jqx7h5uvv
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: reserved-ids
        timestamp: Thu 2007-01-11 12:59:09 -0500
        message:
          Update docs
        ------------------------------------------------------------
        revno: 2220.1.9.2.1
        merged: abentley at panoramicfeedback.com-20070111172025-8rnvvm3jqx7h5uvv
        parent: pqm at pqm.ubuntu.com-20070111014309-058f987c23817400
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: reserved-ids
        timestamp: Thu 2007-01-11 12:20:25 -0500
        message:
          Reject reserved ids in versiondfile, tree, branch and repository
    ------------------------------------------------------------
    revno: 2220.1.18
    merged: pqm at pqm.ubuntu.com-20070117162220-c8e98cc6eec6ed27
    parent: pqm at pqm.ubuntu.com-20070117161135-075d32222962c3eb
    parent: abentley at panoramicfeedback.com-20070117144846-7ql2d2433v28cbwy
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-01-17 16:22:20 +0000
    message:
      Document global options
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.35
        merged: abentley at panoramicfeedback.com-20070117144846-7ql2d2433v28cbwy
        parent: abentley at panoramicfeedback.com-20070117144647-ae1gogd30h12vgwm
        parent: abentley at panoramicfeedback.com-20070117143854-l2r4csg4s6pyosha
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Wed 2007-01-17 09:48:46 -0500
        message:
          Merge the ls changes, so I don't get conflicts submitting this
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.34
        merged: abentley at panoramicfeedback.com-20070117144647-ae1gogd30h12vgwm
        parent: abentley at panoramicfeedback.com-20070117144403-inwzdbaaj8zrfxow
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Wed 2007-01-17 09:46:47 -0500
        message:
          Fix NEWS and whitespace
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.33
        merged: abentley at panoramicfeedback.com-20070117144403-inwzdbaaj8zrfxow
        parent: abentley at panoramicfeedback.com-20070115150638-jvpe348rvjd5rjz4
        parent: pqm at pqm.ubuntu.com-20070117020432-338f7296818dc56e
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Wed 2007-01-17 09:44:03 -0500
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.32
        merged: abentley at panoramicfeedback.com-20070115150638-jvpe348rvjd5rjz4
        parent: abentley at panoramicfeedback.com-20070111155749-v70rw01ug96bs1ll
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Mon 2007-01-15 10:06:38 -0500
        message:
          Add global option help
    ------------------------------------------------------------
    revno: 2220.1.17
    merged: pqm at pqm.ubuntu.com-20070117161135-075d32222962c3eb
    parent: pqm at pqm.ubuntu.com-20070117020432-338f7296818dc56e
    parent: abentley at panoramicfeedback.com-20070117143854-l2r4csg4s6pyosha
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-01-17 16:11:35 +0000
    message:
      ls supports treeless branches and remote branches
        ------------------------------------------------------------
        revno: 2215.3.8
        merged: abentley at panoramicfeedback.com-20070117143854-l2r4csg4s6pyosha
        parent: abentley at panoramicfeedback.com-20070117143649-8fb6gmn8l2kksdh5
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: ls
        timestamp: Wed 2007-01-17 09:38:54 -0500
        message:
          Add NEWS entry
        ------------------------------------------------------------
        revno: 2215.3.7
        merged: abentley at panoramicfeedback.com-20070117143649-8fb6gmn8l2kksdh5
        parent: abentley at panoramicfeedback.com-20070117143315-q6fy80tdcvd99ijc
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: ls
        timestamp: Wed 2007-01-17 09:36:49 -0500
        message:
          Remove (new) trailing whitespace
        ------------------------------------------------------------
        revno: 2215.3.6
        merged: abentley at panoramicfeedback.com-20070117143315-q6fy80tdcvd99ijc
        parent: abentley at panoramicfeedback.com-20070111142618-4vxwo22j91mxexoh
        parent: pqm at pqm.ubuntu.com-20070117020432-338f7296818dc56e
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: ls
        timestamp: Wed 2007-01-17 09:33:15 -0500
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        revno: 2215.3.5
        merged: abentley at panoramicfeedback.com-20070111142618-4vxwo22j91mxexoh
        parent: abentley at panoramicfeedback.com-20070109204105-ajiaop3tb5y1z65d
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: ls
        timestamp: Thu 2007-01-11 09:26:18 -0500
        message:
          Add support for remote ls
        ------------------------------------------------------------
        revno: 2215.3.4
        merged: abentley at panoramicfeedback.com-20070109204105-ajiaop3tb5y1z65d
        parent: abentley at panoramicfeedback.com-20070102201507-zej9hrf5cxxjkypj
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: ls
        timestamp: Tue 2007-01-09 15:41:05 -0500
        message:
          rewrap some text
        ------------------------------------------------------------
        revno: 2215.3.3
        merged: abentley at panoramicfeedback.com-20070102201507-zej9hrf5cxxjkypj
        parent: abentley at panoramicfeedback.com-20070102183359-kco0xv9p9u13i70l
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: ls
        timestamp: Tue 2007-01-02 15:15:07 -0500
        message:
          Get ls working on branches
        ------------------------------------------------------------
        revno: 2215.3.2
        merged: abentley at panoramicfeedback.com-20070102183359-kco0xv9p9u13i70l
        parent: abentley at panoramicfeedback.com-20070102155827-0iel8n3ox02vn4jf
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: ls
        timestamp: Tue 2007-01-02 13:33:59 -0500
        message:
          Add open_containing_tree_or_branch
    ------------------------------------------------------------
    revno: 2220.1.16
    merged: pqm at pqm.ubuntu.com-20070117020432-338f7296818dc56e
    parent: pqm at pqm.ubuntu.com-20070116170721-bbe931a8978b7ce9
    parent: mbp at sourcefrog.net-20070117014923-bo3n6d6y2c30ybmw
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-01-17 02:04:32 +0000
    message:
      (mbp) add selftest --first flag (r=aaron)
        ------------------------------------------------------------
        revno: 2213.2.3
        merged: mbp at sourcefrog.net-20070117014923-bo3n6d6y2c30ybmw
        parent: mbp at sourcefrog.net-20070117014702-yjki61vdjsv3vztw
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: test_first
        timestamp: Wed 2007-01-17 12:49:23 +1100
        message:
          news
        ------------------------------------------------------------
        revno: 2213.2.2
        merged: mbp at sourcefrog.net-20070117014702-yjki61vdjsv3vztw
        parent: mbp at sourcefrog.net-20070114065627-7p3bfihkti28j5fr
        parent: pqm at pqm.ubuntu.com-20070116170721-bbe931a8978b7ce9
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: test_first
        timestamp: Wed 2007-01-17 12:47:02 +1100
        message:
          merge dev
        ------------------------------------------------------------
        revno: 2213.2.1
        merged: mbp at sourcefrog.net-20070114065627-7p3bfihkti28j5fr
        parent: pqm at pqm.ubuntu.com-20061222013706-0e1cb801c2e0ec9d
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: test_first
        timestamp: Sun 2007-01-14 17:56:27 +1100
        message:
          Add selftest --first flag
    ------------------------------------------------------------
    revno: 2220.1.15
    merged: pqm at pqm.ubuntu.com-20070116170721-bbe931a8978b7ce9
    parent: pqm at pqm.ubuntu.com-20070115033134-6f456e8e9cc87f35
    parent: larstiq at larstiq.dyndns.org-20070116155653-aacs32wt8o3u0d2t
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-01-16 17:07:21 +0000
    message:
      (Wouter van Heyst) 0.14rc1 has branch, bump bzr.dev version to 0.15
        ------------------------------------------------------------
        revno: 2220.1.14.1.1
        merged: larstiq at larstiq.dyndns.org-20070116155653-aacs32wt8o3u0d2t
        parent: pqm at pqm.ubuntu.com-20070115033134-6f456e8e9cc87f35
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: bzr.dev
        timestamp: Tue 2007-01-16 16:56:53 +0100
        message:
          0.14rc1 has branch, bump bzr.dev version to 0.15
    ------------------------------------------------------------
    revno: 2220.1.14
    merged: pqm at pqm.ubuntu.com-20070115033134-6f456e8e9cc87f35
    parent: pqm at pqm.ubuntu.com-20070114053311-24541512d81bb5f2
    parent: bialix at ukr.net-20070113200038-ou53qsq5z0bt2gmn
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-01-15 03:31:34 +0000
    message:
      Python 2.5 fixes for win32 installer
        ------------------------------------------------------------
        revno: 2220.1.11.1.1
        merged: bialix at ukr.net-20070113200038-ou53qsq5z0bt2gmn
        parent: pqm at pqm.ubuntu.com-20070113174313-6733d2602d13a317
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: setup.fixes
        timestamp: Sat 2007-01-13 22:00:38 +0200
        message:
          Python 2.5 fixes for win32 installer
    ------------------------------------------------------------
    revno: 2220.1.13
    merged: pqm at pqm.ubuntu.com-20070114053311-24541512d81bb5f2
    parent: pqm at pqm.ubuntu.com-20070113203627-19221becd2626316
    parent: mbp at sourcefrog.net-20070114052115-r1m1xv3iood67m2q
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2007-01-14 05:33:11 +0000
    message:
      (mbp) update global copyright to 2007 (trivial)
        ------------------------------------------------------------
        revno: 2220.1.12.1.1
        merged: mbp at sourcefrog.net-20070114052115-r1m1xv3iood67m2q
        parent: pqm at pqm.ubuntu.com-20070113203627-19221becd2626316
        committer: mbp at sourcefrog.net
        branch nick: trivial
        timestamp: Sun 2007-01-14 16:21:15 +1100
        message:
          update global copyright to 2007
    ------------------------------------------------------------
    revno: 2220.1.12
    merged: pqm at pqm.ubuntu.com-20070113203627-19221becd2626316
    parent: pqm at pqm.ubuntu.com-20070113174313-6733d2602d13a317
    parent: abentley at panoramicfeedback.com-20070111155749-v70rw01ug96bs1ll
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2007-01-13 20:36:27 +0000
    message:
      Optimize iter_changes with specific file_ids
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.31
        merged: abentley at panoramicfeedback.com-20070111155749-v70rw01ug96bs1ll
        parent: abentley at panoramicfeedback.com-20070111151756-2nbmljlj1ixu1h4p
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Thu 2007-01-11 10:57:49 -0500
        message:
          Handle to_paths correctly when parent of file is not in specified_ids
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.30
        merged: abentley at panoramicfeedback.com-20070111151756-2nbmljlj1ixu1h4p
        parent: abentley at panoramicfeedback.com-20061222171136-0co49gz3hl5hx183
        parent: pqm at pqm.ubuntu.com-20070111014309-058f987c23817400
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Thu 2007-01-11 10:17:56 -0500
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        revno: 1551.2.49.1.40.1.22.1.42.1.29
        merged: abentley at panoramicfeedback.com-20061222171136-0co49gz3hl5hx183
        parent: abentley at panoramicfeedback.com-20061221212008-xwcgsfwa9jyrkmna
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: Aaron's mergeable stuff
        timestamp: Fri 2006-12-22 12:11:36 -0500
        message:
          Optimize Tree._iter_changes with specific file_ids
    ------------------------------------------------------------
    revno: 2220.1.11
    merged: pqm at pqm.ubuntu.com-20070113174313-6733d2602d13a317
    parent: pqm at pqm.ubuntu.com-20070111161229-759760c90ec737e6
    parent: larstiq at larstiq.dyndns.org-20070113171550-cn42jvozxsivu2bb
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2007-01-13 17:43:13 +0000
    message:
      Restore (deprecated) access to SHORT_OPTIONS for compatibility.
        ------------------------------------------------------------
        revno: 2220.1.10.1.1
        merged: larstiq at larstiq.dyndns.org-20070113171550-cn42jvozxsivu2bb
        parent: pqm at pqm.ubuntu.com-20070111161229-759760c90ec737e6
        parent: mbp at sourcefrog.net-20070112035807-7b5caanb3y6b4r56
        committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
        branch nick: short-options
        timestamp: Sat 2007-01-13 18:15:50 +0100
        message:
          Merge work on SHORT_OPTIONS by Martin.
        ------------------------------------------------------------
        revno: 2220.1.7.1.5
        merged: mbp at sourcefrog.net-20070112035807-7b5caanb3y6b4r56
        parent: mbp at sourcefrog.net-20070112035212-rgjqu83owh9s5s2p
        committer: mbp at sourcefrog.net
        branch nick: options
        timestamp: Fri 2007-01-12 14:58:07 +1100
        message:
          doc cleanup
        ------------------------------------------------------------
        revno: 2220.1.7.1.4
        merged: mbp at sourcefrog.net-20070112035212-rgjqu83owh9s5s2p
        parent: mbp at sourcefrog.net-20070112034025-lxlybpp2qcxrs3py
        committer: mbp at sourcefrog.net
        branch nick: options
        timestamp: Fri 2007-01-12 14:52:12 +1100
        message:
          add test that legacy SHORT_OPTIONS really works, and set_short_name
        ------------------------------------------------------------
        revno: 2220.1.7.1.3
        merged: mbp at sourcefrog.net-20070112034025-lxlybpp2qcxrs3py
        parent: mbp at sourcefrog.net-20070111080821-yz6m2b1byj72jg0y
        committer: mbp at sourcefrog.net
        branch nick: options
        timestamp: Fri 2007-01-12 14:40:25 +1100
        message:
          Restore access to SHORT_OPTIONS for compatibility
        ------------------------------------------------------------
        revno: 2220.1.7.1.2
        merged: mbp at sourcefrog.net-20070111080821-yz6m2b1byj72jg0y
        parent: mbp at sourcefrog.net-20070110072857-mmf4qblq5u67jz0k
        committer: mbp at sourcefrog.net
        branch nick: options
        timestamp: Thu 2007-01-11 19:08:21 +1100
        message:
          Add a simple DeprecatedDict class
    ------------------------------------------------------------
    revno: 2220.1.10
    merged: pqm at pqm.ubuntu.com-20070111161229-759760c90ec737e6
    parent: pqm at pqm.ubuntu.com-20070111014309-058f987c23817400
    parent: john at arbash-meinel.com-20070111155741-ytnaog8q1mwz71u6
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-01-11 16:12:29 +0000
    message:
      (Vincent Ladeuil) Clean up TestCaseWithMemoryTransport
        ------------------------------------------------------------
        revno: 2220.1.9.1.1
        merged: john at arbash-meinel.com-20070111155741-ytnaog8q1mwz71u6
        parent: pqm at pqm.ubuntu.com-20070111014309-058f987c23817400
        parent: v.ladeuil+lp at free.fr-20070111084551-i00dpvj4161h421n
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2007-01-11 09:57:41 -0600
        message:
          (Vincent Ladeuil) Clean up TestCaseWithMemoryTransport
        ------------------------------------------------------------
        revno: 2220.1.7.2.2
        merged: v.ladeuil+lp at free.fr-20070111084551-i00dpvj4161h421n
        parent: v.ladeuil+lp at free.fr-20070110161134-w7cp18w3yby885d6
        committer: v.ladeuil+lp at free.fr
        branch nick: bzr.memory.tests
        timestamp: Thu 2007-01-11 09:45:51 +0100
        message:
          Cleanup.
          
          * bzrlib/tests/test_selftest.py:
          (TestTestCaseWithMemoryTransport.test_make_branch_and_memory_tree,
          TestTestCaseWithMemoryTransport.test_make_branch_and_memory_tree_with_format):
          Inline previous calls to fail[Unless|If]ExistsOnDisk and clearly
          explain their aim.
          
          * bzrlib/tests/__init__.py:
          (TestCaseWithMemoryTransport.failUnlessExistsOnDisk,
          TestCaseWithMemoryTransport.failIfExistsOnDisk): Deleted. They
          were more confusing than helpful.
          	
        ------------------------------------------------------------
        revno: 2220.1.7.2.1
        merged: v.ladeuil+lp at free.fr-20070110161134-w7cp18w3yby885d6
        parent: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
        committer: v.ladeuil+lp at free.fr
        branch nick: bzr.memory.tests
        timestamp: Wed 2007-01-10 17:11:34 +0100
        message:
          Small fixes to test suite in the hope that it will facilitate the
          adoption of TestCaseWithMemoryTransport.
          
          * bzrlib/tests/test_selftest.py:
          (TestTestCaseWithMemoryTransport.test_make_branch_and_memory_tree,
          TestTestCaseWithMemoryTransport.test_make_branch_and_memory_tree_with_format)):
          Ensures that MemoryTransport is not leaking.
          
          * bzrlib/tests/__init__.py:
          (TestCaseWithMemoryTransport.failUnlessExistsOnDisk,
          TestCaseWithMemoryTransport.failIfExistsOnDisk): Renamed from
          failUnlessExists and failIfExists which should remain targeted at
          testing that a file do not exists in the context of the transport
          specific test.
          (TestCaseInTempDir.failUnlessExists,
          TestCaseInTempDir.failIfExists): Lazily maintain compatibility
          with existing tests: assumes that we work in the current directory
          *on disk*.
    ------------------------------------------------------------
    revno: 2220.1.9
    merged: pqm at pqm.ubuntu.com-20070111014309-058f987c23817400
    parent: pqm at pqm.ubuntu.com-20070110231047-dcd542463a35a2a8
    parent: mbp at sourcefrog.net-20070110072857-mmf4qblq5u67jz0k
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-01-11 01:43:09 +0000
    message:
      restore Option.short_name() to being callable (mbp, r=john, r=alexander)
        ------------------------------------------------------------
        revno: 2220.1.7.1.1
        merged: mbp at sourcefrog.net-20070110072857-mmf4qblq5u67jz0k
        parent: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
        committer: mbp at sourcefrog.net
        branch nick: options
        timestamp: Wed 2007-01-10 18:28:57 +1100
        message:
          Back out previous incompatible change: Option.short_name is now again
          a method that returns the short name, if any.
    ------------------------------------------------------------
    revno: 2220.1.8
    merged: pqm at pqm.ubuntu.com-20070110231047-dcd542463a35a2a8
    parent: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
    parent: bialix at ukr.net-20070110060149-5l6tkxfk19twivei
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-01-10 23:10:47 +0000
    message:
      (bialix) Fit output of 'bzr help' to 25 lines DOS console
        ------------------------------------------------------------
        revno: 2220.1.4.1.1
        merged: bialix at ukr.net-20070110060149-5l6tkxfk19twivei
        parent: pqm at pqm.ubuntu.com-20070104220107-4ecdf9355fdfbf9a
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: small.fixes
        timestamp: Wed 2007-01-10 08:01:49 +0200
        message:
          Fit output of 'bzr help' to 25 lines DOS console
    ------------------------------------------------------------
    revno: 2220.1.7
    merged: pqm at pqm.ubuntu.com-20070109142832-337c25188ea46f2d
    parent: pqm at pqm.ubuntu.com-20070109123444-619fc45c259a23c8
    parent: abentley at panoramicfeedback.com-20070109140826-3qm6nlgvbv5tp62c
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-01-09 14:28:32 +0000
    message:
      Tweak set_default_format
        ------------------------------------------------------------
        revno: 2204.4.13.1.2
        merged: abentley at panoramicfeedback.com-20070109140826-3qm6nlgvbv5tp62c
        parent: abentley at panoramicfeedback.com-20070109140630-6jyhehc4byeby0ui
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: format-registry
        timestamp: Tue 2007-01-09 09:08:26 -0500
        message:
          Tweak set_default_format
        ------------------------------------------------------------
        revno: 2204.4.13.1.1
        merged: abentley at panoramicfeedback.com-20070109140630-6jyhehc4byeby0ui
        parent: abentley at panoramicfeedback.com-20070105171203-uxlz2lhshbykbdin
        parent: pqm at pqm.ubuntu.com-20070109123444-619fc45c259a23c8
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: format-registry
        timestamp: Tue 2007-01-09 09:06:30 -0500
        message:
          Merge bzr.dev
    ------------------------------------------------------------
    revno: 2220.1.6
    merged: pqm at pqm.ubuntu.com-20070109123444-619fc45c259a23c8
    parent: pqm at pqm.ubuntu.com-20070105024018-b849a96645a25c39
    parent: aaron.bentley at utoronto.ca-20070109065743-n2g1jhbki8ta56d9
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-01-09 12:34:44 +0000
    message:
      Deprecate format type set_default methods
        ------------------------------------------------------------
        revno: 2204.4.14
        merged: aaron.bentley at utoronto.ca-20070109065743-n2g1jhbki8ta56d9
        parent: abentley at panoramicfeedback.com-20070105171203-uxlz2lhshbykbdin
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: format-registry
        timestamp: Tue 2007-01-09 01:57:43 -0500
        message:
          lastest -> latest
        ------------------------------------------------------------
        revno: 2204.4.13
        merged: abentley at panoramicfeedback.com-20070105171203-uxlz2lhshbykbdin
        parent: aaron.bentley at utoronto.ca-20070105070840-ku1kogdi0n2wfcqw
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: format-registry
        timestamp: Fri 2007-01-05 12:12:03 -0500
        message:
          Update all test cases to avoid set_default_format
        ------------------------------------------------------------
        revno: 2204.4.12
        merged: aaron.bentley at utoronto.ca-20070105070840-ku1kogdi0n2wfcqw
        parent: aaron.bentley at utoronto.ca-20070105063257-4t62uie9fb3i017j
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: format-registry
        timestamp: Fri 2007-01-05 02:08:40 -0500
        message:
          Deprecate bzrdir.BzrDirFormat.set_default_format
        ------------------------------------------------------------
        revno: 2204.4.11
        merged: aaron.bentley at utoronto.ca-20070105063257-4t62uie9fb3i017j
        parent: aaron.bentley at utoronto.ca-20070103021116-luxnkwbmoxa3j4au
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: format-registry
        timestamp: Fri 2007-01-05 01:32:57 -0500
        message:
          deprecate Repository.set_default_format, update upgrade tests
    ------------------------------------------------------------
    revno: 2220.1.5
    merged: pqm at pqm.ubuntu.com-20070105024018-b849a96645a25c39
    parent: pqm at pqm.ubuntu.com-20070104220107-4ecdf9355fdfbf9a
    parent: bialix at ukr.net-20070104233644-7znkxoj9b0y7ev28
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-01-05 02:40:18 +0000
    message:
      (bialix) Before actually using encoding need to check that Python
       has corresponding codec
        ------------------------------------------------------------
        revno: 2192.1.10
        merged: bialix at ukr.net-20070104233644-7znkxoj9b0y7ev28
        parent: bialix at ukr.net-20070104213543-4b0j8wuoapx8rcv8
        parent: pqm at pqm.ubuntu.com-20070104220107-4ecdf9355fdfbf9a
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Fri 2007-01-05 01:36:44 +0200
        message:
          merge bzr.dev
        ------------------------------------------------------------
        revno: 2192.1.9
        merged: bialix at ukr.net-20070104213543-4b0j8wuoapx8rcv8
        parent: bialix at ukr.net-20070102212039-ohkta3peuykx18pr
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Thu 2007-01-04 23:35:43 +0200
        message:
          final fix suggested by John Meinel
        ------------------------------------------------------------
        revno: 2192.1.8
        merged: bialix at ukr.net-20070102212039-ohkta3peuykx18pr
        parent: bialix at ukr.net-20070102160411-tkmtr5yzu7eha6w1
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Tue 2007-01-02 23:20:39 +0200
        message:
          Rework tests after John's review
        ------------------------------------------------------------
        revno: 2192.1.7
        merged: bialix at ukr.net-20070102160411-tkmtr5yzu7eha6w1
        parent: bialix at ukr.net-20070102143236-68tf5imq1kybper4
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Tue 2007-01-02 18:04:11 +0200
        message:
          get_user_encoding: if locale.Error raised we need to set user_encoding to 'ascii' as warning says
        ------------------------------------------------------------
        revno: 2192.1.6
        merged: bialix at ukr.net-20070102143236-68tf5imq1kybper4
        parent: bialix at ukr.net-20061226153559-f20mxxzikkqbfdw2
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Tue 2007-01-02 16:32:36 +0200
        message:
          Fixes after Aaron's review
        ------------------------------------------------------------
        revno: 2192.1.5
        merged: bialix at ukr.net-20061226153559-f20mxxzikkqbfdw2
        parent: bialix at ukr.net-20061226153359-967kg97kdrtlsmve
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Tue 2006-12-26 17:35:59 +0200
        message:
          NEWS
        ------------------------------------------------------------
        revno: 2192.1.4
        merged: bialix at ukr.net-20061226153359-967kg97kdrtlsmve
        parent: bialix at ukr.net-20061226152950-38ah5iveppgjvb6n
        parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Tue 2006-12-26 17:33:59 +0200
        message:
          merge bzr.dev
        ------------------------------------------------------------
        revno: 2192.1.3
        merged: bialix at ukr.net-20061226152950-38ah5iveppgjvb6n
        parent: bialix at ukr.net-20061226063503-h2flet6hzcogfbkx
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Tue 2006-12-26 17:29:50 +0200
        message:
          Tests for osutils.get_user_encoding
        ------------------------------------------------------------
        revno: 2192.1.2
        merged: bialix at ukr.net-20061226063503-h2flet6hzcogfbkx
        parent: bialix at ukr.net-20061218080613-gw89j2qhwt5p6tb0
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Tue 2006-12-26 08:35:03 +0200
        message:
          Tests for osutils.get_terminal_encoding()
        ------------------------------------------------------------
        revno: 2192.1.1
        merged: bialix at ukr.net-20061218080613-gw89j2qhwt5p6tb0
        parent: pqm at pqm.ubuntu.com-20061216093635-ef3d14265a8a8b6b
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: check-encoding
        timestamp: Mon 2006-12-18 10:06:13 +0200
        message:
          Before actually using encoding need to check that Python has corresponding codec
    ------------------------------------------------------------
    revno: 2220.1.4
    merged: pqm at pqm.ubuntu.com-20070104220107-4ecdf9355fdfbf9a
    parent: pqm at pqm.ubuntu.com-20070104215041-e2f73db439c71aa6
    parent: bialix at ukr.net-20070104013338-s56gyv5aippvif6f
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-01-04 22:01:07 +0000
    message:
      (bialix) fix typo in manpage generators (bugfix #76603)
        ------------------------------------------------------------
        revno: 2220.1.1.3.1
        merged: bialix at ukr.net-20070104013338-s56gyv5aippvif6f
        parent: pqm at pqm.ubuntu.com-20070103073947-f9906c0b1f425aa9
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: bugfix.76603
        timestamp: Thu 2007-01-04 03:33:38 +0200
        message:
          Bugfix #76603: fix typo in bzr manpage text
    ------------------------------------------------------------
    revno: 2220.1.3
    merged: pqm at pqm.ubuntu.com-20070104215041-e2f73db439c71aa6
    parent: pqm at pqm.ubuntu.com-20070104213903-ddc3293ca385e7a9
    parent: abentley at panoramicfeedback.com-20070104205946-fk5wxpb3bqoi3b7e
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-01-04 21:50:41 +0000
    message:
      Make most LockErrors internal
        ------------------------------------------------------------
        revno: 2220.1.1.2.2
        merged: abentley at panoramicfeedback.com-20070104205946-fk5wxpb3bqoi3b7e
        parent: abentley at panoramicfeedback.com-20070104202328-tl50qdeut094l3vh
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: internalerror
        timestamp: Thu 2007-01-04 15:59:46 -0500
        message:
          PEP8-correctness
        ------------------------------------------------------------
        revno: 2220.1.1.2.1
        merged: abentley at panoramicfeedback.com-20070104202328-tl50qdeut094l3vh
        parent: pqm at pqm.ubuntu.com-20070103073947-f9906c0b1f425aa9
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: internalerror
        timestamp: Thu 2007-01-04 15:23:28 -0500
        message:
          Make most lock errors internal
    ------------------------------------------------------------
    revno: 2220.1.2
    merged: pqm at pqm.ubuntu.com-20070104213903-ddc3293ca385e7a9
    parent: pqm at pqm.ubuntu.com-20070103073947-f9906c0b1f425aa9
    parent: john at arbash-meinel.com-20070104200616-5c09warmkqcgcbar
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-01-04 21:39:03 +0000
    message:
      (James Henstridge) Don't rely on time.timezone and time.altzone, since they are not always updated properly.
        ------------------------------------------------------------
        revno: 2220.1.1.1.1
        merged: john at arbash-meinel.com-20070104200616-5c09warmkqcgcbar
        parent: pqm at pqm.ubuntu.com-20070103073947-f9906c0b1f425aa9
        parent: james at jamesh.id.au-20070104104555-6ffbz0z2ywkfspk1
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Thu 2007-01-04 14:06:16 -0600
        message:
          (James Henstridge) Don't rely on time.timezone and time.altzone, since they are not always updated properly.
        ------------------------------------------------------------
        revno: 2215.6.3
        merged: james at jamesh.id.au-20070104104555-6ffbz0z2ywkfspk1
        parent: james at jamesh.id.au-20070102084032-se8cqzt2yg2bnpsn
        committer: James Henstridge <james at jamesh.id.au>
        branch nick: bzr.smallfixes (James Henstridge)
        timestamp: Thu 2007-01-04 19:45:55 +0900
        message:
          narrow the range that the local_time_offset() test uses
        ------------------------------------------------------------
        revno: 2215.6.2
        merged: james at jamesh.id.au-20070102084032-se8cqzt2yg2bnpsn
        parent: james at jamesh.id.au-20070101213631-kq9gl0ltvmpm12y0
        committer: James Henstridge <james at jamesh.id.au>
        branch nick: bzr.smallfixes (James Henstridge)
        timestamp: Tue 2007-01-02 17:40:32 +0900
        message:
          add some simple tests for local_time_offset()
        ------------------------------------------------------------
        revno: 2215.6.1
        merged: james at jamesh.id.au-20070101213631-kq9gl0ltvmpm12y0
        parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
        committer: James Henstridge <james at jamesh.id.au>
        branch nick: bzr.smallfixes (James Henstridge)
        timestamp: Tue 2007-01-02 06:36:31 +0900
        message:
          Don't rely on time.timezone and time.altzone in local_time_offset(), 
          since they may not be accurate or applicable to the given timestamp (see 
          bug 77588).
          
          Instead, use the datetime module to find the difference between the 
          local time representation and UTC time representation of the timestamp.
    ------------------------------------------------------------
    revno: 2220.1.1
    merged: pqm at pqm.ubuntu.com-20070103073947-f9906c0b1f425aa9
    parent: pqm at pqm.ubuntu.com-20070103022432-334b367262bc7407
    parent: bialix at ukr.net-20070102124019-0qknbaxgbdxnkfhb
    committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-01-03 07:39:47 +0000
    message:
      (bialix) Fix generation of rstx man page
    ------------------------------------------------------------
    revno: 2215.5.1
    merged: bialix at ukr.net-20070102124019-0qknbaxgbdxnkfhb
    parent: pqm at pqm.ubuntu.com-20061222180719-31fc1e7cbaf32a4b
    committer: Alexander Belchenko <bialix at ukr.net>
    branch nick: bzr_man.rstx
    timestamp: Tue 2007-01-02 14:40:19 +0200
    message:
      Fix generation of rstx man page (problem with short names of options) and provide simple tests for future.

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



More information about the bazaar-commits mailing list