Rev 2797: Merge bzr.dev. in http://people.ubuntu.com/~robertc/baz2.0/commit

Robert Collins robertc at robertcollins.net
Thu Sep 27 22:12:23 BST 2007


At http://people.ubuntu.com/~robertc/baz2.0/commit

------------------------------------------------------------
revno: 2797
revision-id: robertc at robertcollins.net-20070927211138-ebsu1bo1qz9f1w8n
parent: robertc at robertcollins.net-20070921061031-p945q13ra1jjcli2
parent: pqm at pqm.ubuntu.com-20070927065437-oc8enxoek80hyxod
committer: Robert Collins <robertc at robertcollins.net>
branch nick: commit
timestamp: Fri 2007-09-28 07:11:38 +1000
message:
  Merge bzr.dev.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
  bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
  bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
  bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
  bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tag.py                  tag.py-20070212110532-91cw79inah2cfozx-1
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
  bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
  bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
  bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
  bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
  bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
  bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
  bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
  bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
  bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
  bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
  bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
  bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
  bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
  bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
  bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
  bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
  bzrlib/tests/test_tag.py       test_tag.py-20070212110532-91cw79inah2cfozx-2
  bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
  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/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
  bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
  bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
  bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
  bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
  setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.46
    revision-id: pqm at pqm.ubuntu.com-20070927065437-oc8enxoek80hyxod
    parent: pqm at pqm.ubuntu.com-20070927030442-kr30mx8du7pq8o3m
    parent: robertc at robertcollins.net-20070927051534-8qi8csecebcltwhx
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-09-27 07:54:37 +0100
    message:
      (robertc) Code consolidation for the Knit repository format from the packs branch. (Robert Collins)
    modified:
      bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.32.2.2
        revision-id: robertc at robertcollins.net-20070927051534-8qi8csecebcltwhx
        parent: robertc at robertcollins.net-20070925042530-t6k5echm7yaz9maf
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: knit-repo
        timestamp: Thu 2007-09-27 15:15:34 +1000
        message:
          Review feedback.
        modified:
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.32.2.1
        revision-id: robertc at robertcollins.net-20070925042530-t6k5echm7yaz9maf
        parent: pqm at pqm.ubuntu.com-20070925032108-y6nxt0xmghqldn4g
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: knit-repo
        timestamp: Tue 2007-09-25 14:25:30 +1000
        message:
          (robertc) Knit repo format tidyups from the packs branch. (Robert Collins)
        modified:
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.45
    revision-id: pqm at pqm.ubuntu.com-20070927030442-kr30mx8du7pq8o3m
    parent: pqm at pqm.ubuntu.com-20070926044943-flj37wmwhmd0l3f1
    parent: robertc at robertcollins.net-20070927021812-13m2l8q0m5qbmykj
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2007-09-27 04:04:42 +0100
    message:
      (robertc) Minor tweaks to reconcile from the packs branch. (Robert Collins)
    modified:
      bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
      bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.32.1.2
        revision-id: robertc at robertcollins.net-20070927021812-13m2l8q0m5qbmykj
        parent: robertc at robertcollins.net-20070925035721-wjyn9fjd4vxy5n7f
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: reconcile
        timestamp: Thu 2007-09-27 12:18:12 +1000
        message:
          Review feedback.
        modified:
          bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.32.1.1
        revision-id: robertc at robertcollins.net-20070925035721-wjyn9fjd4vxy5n7f
        parent: pqm at pqm.ubuntu.com-20070925032108-y6nxt0xmghqldn4g
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: reconcile
        timestamp: Tue 2007-09-25 13:57:21 +1000
        message:
          (robertc) Reconcile tweaks from the packs branch. (Robert Collins)
        modified:
          bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
          bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.44
    revision-id: pqm at pqm.ubuntu.com-20070926044943-flj37wmwhmd0l3f1
    parent: pqm at pqm.ubuntu.com-20070926041021-v62vw12qiba8vi4k
    parent: ian.clatworthy at internode.on.net-20070926025305-ndw0bqjg58mzmesa
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-09-26 05:49:43 +0100
    message:
      code clean-ups for bzrdir.py (Ian Clatworthy)
    modified:
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
      bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.42.1.1
        revision-id: ian.clatworthy at internode.on.net-20070926025305-ndw0bqjg58mzmesa
        parent: pqm at pqm.ubuntu.com-20070925233221-gwux298mtf2uy53w
        parent: ian.clatworthy at internode.on.net-20070926025116-m1qpc390hj9ntbz7
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: ianc-integration2
        timestamp: Wed 2007-09-26 12:53:05 +1000
        message:
          code clean-ups for bzrdir.py (Ian Clatworthy)
        modified:
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.5.1.4
        revision-id: ian.clatworthy at internode.on.net-20070926025116-m1qpc390hj9ntbz7
        parent: ian.clatworthy at internode.on.net-20070921075617-ihtsvjnp6ic08rlw
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.code-cleanup
        timestamp: Wed 2007-09-26 12:51:16 +1000
        message:
          review tweaks
        modified:
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.5.1.3
        revision-id: ian.clatworthy at internode.on.net-20070921075617-ihtsvjnp6ic08rlw
        parent: ian.clatworthy at internode.on.net-20070921072937-ase3yh9f1pune4vq
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.code-cleanup
        timestamp: Fri 2007-09-21 17:56:17 +1000
        message:
          test that bzrdir retiring fails as expected once limit reached
        modified:
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.5.1.2
        revision-id: ian.clatworthy at internode.on.net-20070921072937-ase3yh9f1pune4vq
        parent: ian.clatworthy at internode.on.net-20070918071435-cjetogmh16akg4v8
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.code-cleanup
        timestamp: Fri 2007-09-21 17:29:37 +1000
        message:
          Incorporate feedback from poolie's review
        modified:
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.5.1.1
        revision-id: ian.clatworthy at internode.on.net-20070918071435-cjetogmh16akg4v8
        parent: pqm at pqm.ubuntu.com-20070918034007-n72x452efuovdelm
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.code-cleanup
        timestamp: Tue 2007-09-18 17:14:35 +1000
        message:
          bzrdir.py code clean-ups
        modified:
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.43
    revision-id: pqm at pqm.ubuntu.com-20070926041021-v62vw12qiba8vi4k
    parent: pqm at pqm.ubuntu.com-20070925233221-gwux298mtf2uy53w
    parent: mbp at sourcefrog.net-20070926023624-25aievju0yd3m10l
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-09-26 05:10:21 +0100
    message:
      #144633 Fix "unprintable error" message for BzrCheckError and others (mbp)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.29.1.3
        revision-id: mbp at sourcefrog.net-20070926023624-25aievju0yd3m10l
        parent: mbp at sourcefrog.net-20070926023045-npkv70za15v30w1r
        parent: pqm at pqm.ubuntu.com-20070925233221-gwux298mtf2uy53w
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: exception-keyerrors
        timestamp: Wed 2007-09-26 12:36:24 +1000
        message:
          merge trunk
        added:
          bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
          bzrlib/tag.py                  tag.py-20070212110532-91cw79inah2cfozx-1
          bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
          bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_tag.py       test_tag.py-20070212110532-91cw79inah2cfozx-2
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.29.1.2
        revision-id: mbp at sourcefrog.net-20070926023045-npkv70za15v30w1r
        parent: mbp at sourcefrog.net-20070925062946-1tlmmt604lf9bllm
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: exception-keyerrors
        timestamp: Wed 2007-09-26 12:30:45 +1000
        message:
          Review feedback on BzrError.message handling
        modified:
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.29.1.1
        revision-id: mbp at sourcefrog.net-20070925062946-1tlmmt604lf9bllm
        parent: pqm at pqm.ubuntu.com-20070924212812-g325vvenhnfktgbh
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: exception-keyerrors
        timestamp: Tue 2007-09-25 16:29:46 +1000
        message:
          Fix "unprintable error" message for BzrCheckError and others
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.42
    revision-id: pqm at pqm.ubuntu.com-20070925233221-gwux298mtf2uy53w
    parent: pqm at pqm.ubuntu.com-20070925212801-8p7l0qlplb0t7h2u
    parent: bialix at ukr.net-20070925221308-aqaqq1u2qv6kpl2z
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Wed 2007-09-26 00:32:21 +0100
    message:
      Fix log against smart server branches that don't support tags. (James
       Westby)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tag.py                  tag.py-20070212110532-91cw79inah2cfozx-1
      bzrlib/tests/test_tag.py       test_tag.py-20070212110532-91cw79inah2cfozx-2
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.41.1.1
        revision-id: bialix at ukr.net-20070925221308-aqaqq1u2qv6kpl2z
        parent: pqm at pqm.ubuntu.com-20070925212801-8p7l0qlplb0t7h2u
        parent: jw+debian at jameswestby.net-20070918185500-91alkjx8zolds1v8
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: james.westby
        timestamp: Wed 2007-09-26 01:13:08 +0300
        message:
          merge with bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tag.py                  tag.py-20070212110532-91cw79inah2cfozx-1
          bzrlib/tests/test_tag.py       test_tag.py-20070212110532-91cw79inah2cfozx-2
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.6.8.1
        revision-id: jw+debian at jameswestby.net-20070918185500-91alkjx8zolds1v8
        parent: pqm at pqm.ubuntu.com-20070918045733-es6jch43pxvogvhj
        committer: James Westby <jw+debian at jameswestby.net>
        branch nick: bzr.dev
        timestamp: Tue 2007-09-18 19:55:00 +0100
        message:
          Fix log against smart server branches that don't support tags. (#140615)
          
          Add get_reverse_tag_dict to DisabledTags for branches that falsely
          claim that they support tags (namely smart server branches). When the
          remote branch was an old format without tags this caused log to fail.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tag.py                  tag.py-20070212110532-91cw79inah2cfozx-1
          bzrlib/tests/test_tag.py       test_tag.py-20070212110532-91cw79inah2cfozx-2
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.41
    revision-id: pqm at pqm.ubuntu.com-20070925212801-8p7l0qlplb0t7h2u
    parent: pqm at pqm.ubuntu.com-20070925205148-yd27v1odc65uql59
    parent: bialix at ukr.net-20070925194100-zw5hcmc85hf3m0uf
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-09-25 22:28:01 +0100
    message:
      `setup.py install` on systems without C-compiler
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 2776.2.18.1.20.4.6
        revision-id: bialix at ukr.net-20070925194100-zw5hcmc85hf3m0uf
        parent: bialix at ukr.net-20070915051300-fyhdnjmmv97uec4u
        parent: pqm at pqm.ubuntu.com-20070925092014-7t2piu8gmm5hvbks
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: install.wo.compiler
        timestamp: Tue 2007-09-25 22:41:00 +0300
        message:
          merge bzr.dev
        added:
          bzrlib/reconfigure.py          reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
          bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
          bzrlib/tests/blackbox/test_unknowns.py test_unknowns.py-20070905015344-74tg6s1synijo2oe-1
          bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
          bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
          doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
        modified:
          .bzrignore                     bzrignore-20050311232317-81f7b71efa2db11a
          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/benchmarks/tree_creator/kernel_like.py kernel_like.py-20060815024128-b16a7pn542u6b13k-1
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/commands.py             bzr.py-20050309040720-d10f4714595cf8c3
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/lsprof.py               lsprof.py-20051208071030-833790916798ceed
          bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
          bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/HttpServer.py     httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
          bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
          bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
          bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
          bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
          bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
          bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
          bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
          bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
          bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_lsprof.py    test_lsprof.py-20070606095601-bctdndm8yhc0cqnc-1
          bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
          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_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          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/test_weave.py     testknit.py-20050627023648-9833cc5562ffb785
          bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
          bzrlib/tests/test_xml.py       test_xml.py-20050905091053-80b45588931a9b35
          bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
          bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
          bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
          bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/tuned_gzip.py           tuned_gzip.py-20060407014720-5aadc518e928e8d2
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
          bzrlib/xml4.py                 xml4.py-20050916091259-db5ab55e7e6ca324
          bzrlib/xml5.py                 xml5.py-20050907032657-aac8f960815b66b1
          bzrlib/xml6.py                 xml6.py-20060823042456-dbaaq4atrche7xy5-1
          bzrlib/xml_serializer.py       xml.py-20050309040759-57d51586fdec365d
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
          doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
        ------------------------------------------------------------
        revno: 2776.2.18.1.20.4.5
        revision-id: bialix at ukr.net-20070915051300-fyhdnjmmv97uec4u
        parent: bialix at ukr.net-20070914113928-u2my9p5l1oxdq760
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: install.wo.compiler
        timestamp: Sat 2007-09-15 08:13:00 +0300
        message:
          double quotes for extension name
        modified:
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 2776.2.18.1.20.4.4
        revision-id: bialix at ukr.net-20070914113928-u2my9p5l1oxdq760
        parent: bialix at ukr.net-20070913122547-019sbxz14kyyl37l
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: install.wo.compiler
        timestamp: Fri 2007-09-14 14:39:28 +0300
        message:
          changes suggested by Aaron and Martin
        modified:
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 2776.2.18.1.20.4.3
        revision-id: bialix at ukr.net-20070913122547-019sbxz14kyyl37l
        parent: bialix at ukr.net-20070913110018-whu5m8wfdu7j3n5e
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: install.wo.compiler
        timestamp: Thu 2007-09-13 15:25:47 +0300
        message:
          fixed incomplete try-except
        modified:
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 2776.2.18.1.20.4.2
        revision-id: bialix at ukr.net-20070913110018-whu5m8wfdu7j3n5e
        parent: lalinsky at gmail.com-20070911080621-kru223e15w1fkzaa
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: install.wo.compiler
        timestamp: Thu 2007-09-13 14:00:18 +0300
        message:
          support for win32
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
        ------------------------------------------------------------
        revno: 2776.2.18.1.20.4.1
        revision-id: lalinsky at gmail.com-20070911080621-kru223e15w1fkzaa
        parent: pqm at pqm.ubuntu.com-20070911055622-a3060rj7l0iy38l2
        committer: Lukáš Lalinský <lalinsky at gmail.com>
        branch nick: build_ext_if_possible
        timestamp: Tue 2007-09-11 10:06:21 +0200
        message:
          Don't abort ``python setup.py install`` if building of a C extension is not possible.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.40
    revision-id: pqm at pqm.ubuntu.com-20070925205148-yd27v1odc65uql59
    parent: pqm at pqm.ubuntu.com-20070925201921-vjahqpm8bfx6bbvn
    parent: bialix at ukr.net-20070925193251-tyn89934php66ney
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-09-25 21:51:48 +0100
    message:
      separate word (dev/candidate) in version info with dots
    modified:
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.37.1.1
        revision-id: bialix at ukr.net-20070925193251-tyn89934php66ney
        parent: pqm at pqm.ubuntu.com-20070925092014-7t2piu8gmm5hvbks
        parent: bialix at ukr.net-20070913093037-n8bp84n8kcifkvqu
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: dotted.version.info
        timestamp: Tue 2007-09-25 22:32:51 +0300
        message:
          merge with bzr.dev
        modified:
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
        ------------------------------------------------------------
        revno: 2776.2.18.1.20.3.1
        revision-id: bialix at ukr.net-20070913093037-n8bp84n8kcifkvqu
        parent: pqm at pqm.ubuntu.com-20070911055622-a3060rj7l0iy38l2
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: dotted.version
        timestamp: Thu 2007-09-13 12:30:37 +0300
        message:
          separate word (dev/candidate) in version info with dots
        modified:
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.39
    revision-id: pqm at pqm.ubuntu.com-20070925201921-vjahqpm8bfx6bbvn
    parent: pqm at pqm.ubuntu.com-20070925194602-h8z36snrc8eqjj4j
    parent: bialix at ukr.net-20070925192314-emlzeasnptqpvd1b
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-09-25 21:19:21 +0100
    message:
      test for bug #140419 
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.8.2.4
        revision-id: bialix at ukr.net-20070925192314-emlzeasnptqpvd1b
        parent: bialix at ukr.net-20070925191741-u1ak81l763dsym0w
        parent: pqm at pqm.ubuntu.com-20070925092014-7t2piu8gmm5hvbks
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: bugtest.140419
        timestamp: Tue 2007-09-25 22:23:14 +0300
        message:
          merge bzr.dev
        added:
          bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
          bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
          bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
          bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
          bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
          bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.8.2.3
        revision-id: bialix at ukr.net-20070925191741-u1ak81l763dsym0w
        parent: bialix at ukr.net-20070922172916-yzl05wpf8ye852gw
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: bugtest.140419
        timestamp: Tue 2007-09-25 22:17:41 +0300
        message:
          typo
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.8.2.2
        revision-id: bialix at ukr.net-20070922172916-yzl05wpf8ye852gw
        parent: bialix at ukr.net-20070920093025-cy85a36ry1xad131
        parent: pqm at pqm.ubuntu.com-20070921081743-jhdchcp1wiwmw0jv
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: bugtest.140419
        timestamp: Sat 2007-09-22 20:29:16 +0300
        message:
          Bug #140419 fixed by Robert Collins
        added:
          doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/HttpServer.py     httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
          bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
          bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
          bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
          bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
          bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/tests/test_weave.py     testknit.py-20050627023648-9833cc5562ffb785
          bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
          bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
          bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/tuned_gzip.py           tuned_gzip.py-20060407014720-5aadc518e928e8d2
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.8.2.1
        revision-id: bialix at ukr.net-20070920093025-cy85a36ry1xad131
        parent: pqm at pqm.ubuntu.com-20070919101753-4e8wasie12tewyjv
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: bugtest.140419
        timestamp: Thu 2007-09-20 12:30:25 +0300
        message:
          XFAIL test for bug #140419
        modified:
          bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.38
    revision-id: pqm at pqm.ubuntu.com-20070925194602-h8z36snrc8eqjj4j
    parent: pqm at pqm.ubuntu.com-20070925092014-7t2piu8gmm5hvbks
    parent: bialix at ukr.net-20070925190431-latvmyau7wq0ny90
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-09-25 20:46:02 +0100
    message:
      option -c for merge command (bialix,r=ian)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.14.5.3
        revision-id: bialix at ukr.net-20070925190431-latvmyau7wq0ny90
        parent: bialix at ukr.net-20070925190148-otovr0vsac3h9nps
        parent: pqm at pqm.ubuntu.com-20070925092014-7t2piu8gmm5hvbks
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: merge.--changes
        timestamp: Tue 2007-09-25 22:04:31 +0300
        message:
          merge bzr.dev
        added:
          bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
          bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
          bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
          bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
          bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
          bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
          bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
          bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          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_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
          bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
          bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
          bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
          bzrlib/tuned_gzip.py           tuned_gzip.py-20060407014720-5aadc518e928e8d2
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.14.5.2
        revision-id: bialix at ukr.net-20070925190148-otovr0vsac3h9nps
        parent: bialix at ukr.net-20070922175238-utwpezl628vcusbl
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: merge.--changes
        timestamp: Tue 2007-09-25 22:01:48 +0300
        message:
          tweaks suggested by Ian
        modified:
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.14.5.1
        revision-id: bialix at ukr.net-20070922175238-utwpezl628vcusbl
        parent: pqm at pqm.ubuntu.com-20070920125023-upjqmzln7mjtvj1h
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: merge.--changes
        timestamp: Sat 2007-09-22 20:52:38 +0300
        message:
          add -c option to merge command
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.37
    revision-id: pqm at pqm.ubuntu.com-20070925092014-7t2piu8gmm5hvbks
    parent: pqm at pqm.ubuntu.com-20070925083651-rthie4089wg1wf6o
    parent: robertc at robertcollins.net-20070925084129-ca0kd25h23dmunrs
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-09-25 10:20:14 +0100
    message:
      (robertc) Introduce new method Tree.path_content_summary for use in commit refactoring. (Robert Collins)
    added:
      bzrlib/tests/tree_implementations/test_path_content_summary.py test_path_content_su-20070904100855-3vrwedz6akn34kl5-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
      bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
      bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 2783.1.2
        revision-id: robertc at robertcollins.net-20070925084129-ca0kd25h23dmunrs
        parent: robertc at robertcollins.net-20070925055031-ybtg84jah7lei4gc
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: workingtree
        timestamp: Tue 2007-09-25 18:41:29 +1000
        message:
          Review feedback.
        modified:
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
        ------------------------------------------------------------
        revno: 2783.1.1
        revision-id: robertc at robertcollins.net-20070925055031-ybtg84jah7lei4gc
        parent: robertc at robertcollins.net-20070904100858-971b6sssddwfmwrw
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: workingtree
        timestamp: Tue 2007-09-25 15:50:31 +1000
        message:
          Retrieve the sha from the dirstate for path_content_summary on hash cache hits; slight performance hit but a big win for incremental commits.
        modified:
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.36
    revision-id: pqm at pqm.ubuntu.com-20070925083651-rthie4089wg1wf6o
    parent: pqm at pqm.ubuntu.com-20070925080109-vqlnacer5iwwmxm8
    parent: robertc at robertcollins.net-20070925070807-5chbtkqectn8exun
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-09-25 09:36:51 +0100
    message:
      (robertc) Trivial update for bundle v4 serializers install method to use write groups. (Robert Collins)
    modified:
      bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.31.1.2
        revision-id: robertc at robertcollins.net-20070925070807-5chbtkqectn8exun
        parent: robertc at robertcollins.net-20070925030942-dt0leks0l5j34r0n
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: bundle
        timestamp: Tue 2007-09-25 17:08:07 +1000
        message:
          Review feedback.
        modified:
          bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.31.1.1
        revision-id: robertc at robertcollins.net-20070925030942-dt0leks0l5j34r0n
        parent: pqm at pqm.ubuntu.com-20070925020712-sf3qg1j3wh0l0hz8
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: bundle
        timestamp: Tue 2007-09-25 13:09:42 +1000
        message:
          (robertc) Trivial update for bundle v4 serializers install method to use write groups. (Robert Collins)
        modified:
          bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.35
    revision-id: pqm at pqm.ubuntu.com-20070925080109-vqlnacer5iwwmxm8
    parent: pqm at pqm.ubuntu.com-20070925072846-g54nzuhu1b5n3xyn
    parent: ian.clatworthy at internode.on.net-20070925064345-o8jx2jhis3zh0x9s
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-09-25 09:01:09 +0100
    message:
      Joining of annotated and plain knits (Ian Clatworthy)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.33.1.1
        revision-id: ian.clatworthy at internode.on.net-20070925064345-o8jx2jhis3zh0x9s
        parent: pqm at pqm.ubuntu.com-20070925041614-j2r43hi8rhw9ci4k
        parent: ian.clatworthy at internode.on.net-20070925064104-gdj0iea73g9iy24i
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: ianc-integration2
        timestamp: Tue 2007-09-25 16:43:45 +1000
        message:
          Joining of annotated and plain knits (Ian Clatworthy)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.26.4.6
        revision-id: ian.clatworthy at internode.on.net-20070925064104-gdj0iea73g9iy24i
        parent: ian.clatworthy at internode.on.net-20070925053912-o5wat48zhxc3q5r9
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.knit-pack-joins
        timestamp: Tue 2007-09-25 16:41:04 +1000
        message:
          review tweaks
        modified:
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.26.4.5
        revision-id: ian.clatworthy at internode.on.net-20070925053912-o5wat48zhxc3q5r9
        parent: ian.clatworthy at internode.on.net-20070925053538-efa084hz0ejvgh21
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.knit-pack-joins
        timestamp: Tue 2007-09-25 15:39:12 +1000
        message:
          Update NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.26.4.4
        revision-id: ian.clatworthy at internode.on.net-20070925053538-efa084hz0ejvgh21
        parent: ian.clatworthy at internode.on.net-20070925053507-pcgw7jrgdggp2mq8
        parent: pqm at pqm.ubuntu.com-20070925020712-sf3qg1j3wh0l0hz8
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.knit-pack-joins
        timestamp: Tue 2007-09-25 15:35:38 +1000
        message:
          merge bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.26.4.3
        revision-id: ian.clatworthy at internode.on.net-20070925053507-pcgw7jrgdggp2mq8
        parent: ian.clatworthy at internode.on.net-20070925045420-33ld2lbxqqwq87fi
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.knit-pack-joins
        timestamp: Tue 2007-09-25 15:35:07 +1000
        message:
          fix up plain-to-annotated knit conversion
        modified:
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.26.4.2
        revision-id: ian.clatworthy at internode.on.net-20070925045420-33ld2lbxqqwq87fi
        parent: ian.clatworthy at internode.on.net-20070924131621-19n00l12199eklzp
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.knit-pack-joins
        timestamp: Tue 2007-09-25 14:54:20 +1000
        message:
          use factory methods in annotated-to-plain conversion instead of duplicating format knowledge
        modified:
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.26.4.1
        revision-id: ian.clatworthy at internode.on.net-20070924131621-19n00l12199eklzp
        parent: pqm at pqm.ubuntu.com-20070924042807-nfjwj1voh6a8zddf
        committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
        branch nick: bzr.knit-pack-joins
        timestamp: Mon 2007-09-24 23:16:21 +1000
        message:
          Support joining plain knits to annotated knits and vice versa
        modified:
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.34
    revision-id: pqm at pqm.ubuntu.com-20070925072846-g54nzuhu1b5n3xyn
    parent: pqm at pqm.ubuntu.com-20070925041614-j2r43hi8rhw9ci4k
    parent: mbp at sourcefrog.net-20070924060049-016r89ialgbf886s
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-09-25 08:28:46 +0100
    message:
      Add unit test for _rollover_trace_maybe
    modified:
      bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
      bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.26.3.1
        revision-id: mbp at sourcefrog.net-20070924060049-016r89ialgbf886s
        parent: pqm at pqm.ubuntu.com-20070924042807-nfjwj1voh6a8zddf
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: logfile-rollover
        timestamp: Mon 2007-09-24 16:00:49 +1000
        message:
          Add unit test for _rollover_trace_maybe
        modified:
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.33
    revision-id: pqm at pqm.ubuntu.com-20070925041614-j2r43hi8rhw9ci4k
    parent: pqm at pqm.ubuntu.com-20070925032108-y6nxt0xmghqldn4g
    parent: robertc at robertcollins.net-20070925033629-2wx6ibqr3zyjkswx
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-09-25 05:16:14 +0100
    message:
      (robertc) Move more weave orientated code out of Repository to weaverepo.py. (Robert Collins)
    modified:
      bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
      bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.25.3.2
        revision-id: robertc at robertcollins.net-20070925033629-2wx6ibqr3zyjkswx
        parent: robertc at robertcollins.net-20070923222217-n7494b41iceeik08
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: pack-support
        timestamp: Tue 2007-09-25 13:36:29 +1000
        message:
          Review feedback.
        modified:
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.25.3.1
        revision-id: robertc at robertcollins.net-20070923222217-n7494b41iceeik08
        parent: pqm at pqm.ubuntu.com-20070923210826-t3ymvo1l68z96in1
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: pack-support
        timestamp: Mon 2007-09-24 08:22:17 +1000
        message:
          Move various weave specific code out of the base Repository class to weaverepo.py.
        modified:
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.32
    revision-id: pqm at pqm.ubuntu.com-20070925032108-y6nxt0xmghqldn4g
    parent: pqm at pqm.ubuntu.com-20070925020712-sf3qg1j3wh0l0hz8
    parent: mbp at sourcefrog.net-20070924051837-6qvnc9tca3y4xflp
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-09-25 04:21:08 +0100
    message:
      Add revert --forget-merges
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.26.2.1
        revision-id: mbp at sourcefrog.net-20070924051837-6qvnc9tca3y4xflp
        parent: pqm at pqm.ubuntu.com-20070924042807-nfjwj1voh6a8zddf
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: forget-merges
        timestamp: Mon 2007-09-24 15:18:37 +1000
        message:
          Add revert --forget-merges
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.31
    revision-id: pqm at pqm.ubuntu.com-20070925020712-sf3qg1j3wh0l0hz8
    parent: pqm at pqm.ubuntu.com-20070925010251-tjzcun2wc2l4grec
    parent: robertc at robertcollins.net-20070925011559-8m3sbotvugyn0144
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-09-25 03:07:12 +0100
    message:
      (robertc) Trivial repr for CombinedGraphIndex. (Martin Pool).
    modified:
      bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.30.1.1
        revision-id: robertc at robertcollins.net-20070925011559-8m3sbotvugyn0144
        parent: pqm at pqm.ubuntu.com-20070925010251-tjzcun2wc2l4grec
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: index
        timestamp: Tue 2007-09-25 11:15:59 +1000
        message:
          (robertc) Trivial repr for CombinedGraphIndex. (Martin Pool).
        modified:
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.30
    revision-id: pqm at pqm.ubuntu.com-20070925010251-tjzcun2wc2l4grec
    parent: pqm at pqm.ubuntu.com-20070924212812-g325vvenhnfktgbh
    parent: robertc at robertcollins.net-20070924201329-jwfqgsqbrnzpd10b
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2007-09-25 02:02:51 +0100
    message:
      (robertc) Transport.put_file now returns the number of bytes written. (Robert Collins)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
      bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
      bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
      bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
      bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
      bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
      bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
      bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.28.1.1
        revision-id: robertc at robertcollins.net-20070924201329-jwfqgsqbrnzpd10b
        parent: pqm at pqm.ubuntu.com-20070924114153-9j0aboyxyah6sv2c
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: transport.put
        timestamp: Tue 2007-09-25 06:13:29 +1000
        message:
          * ``bzrlib.transport.Transport.put_file`` now returns the number of bytes
            put by the method call, to allow avoiding stat-after-write or
            housekeeping in callers. (Robert Collins)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
          bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.29
    revision-id: pqm at pqm.ubuntu.com-20070924212812-g325vvenhnfktgbh
    parent: pqm at pqm.ubuntu.com-20070924114153-9j0aboyxyah6sv2c
    parent: robertc at robertcollins.net-20070924193404-oyg9f9fcfvyr5435
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-09-24 22:28:12 +0100
    message:
      (robertc) Special case the zero-or-no-heads case for Graph.heads(). (Robert Collins)
    modified:
      bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.25.2.1
        revision-id: robertc at robertcollins.net-20070924193404-oyg9f9fcfvyr5435
        parent: pqm at pqm.ubuntu.com-20070923210826-t3ymvo1l68z96in1
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: graphwalker
        timestamp: Tue 2007-09-25 05:34:04 +1000
        message:
          (robertc) Special case the zero-or-no-heads case for Graph.heads(). (Robert Collins)
        modified:
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.28
    revision-id: pqm at pqm.ubuntu.com-20070924114153-9j0aboyxyah6sv2c
    parent: pqm at pqm.ubuntu.com-20070924102745-ohorpye5tifec1q3
    parent: v.ladeuil+lp at free.fr-20070924110757-ed00gn8z0x259dmz
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-09-24 12:41:53 +0100
    message:
      Fix typo
    modified:
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.27.1.1
        revision-id: v.ladeuil+lp at free.fr-20070924110757-ed00gn8z0x259dmz
        parent: pqm at pqm.ubuntu.com-20070924102745-ohorpye5tifec1q3
        parent: v.ladeuil+lp at free.fr-20070924110505-4apfu3r909hamrtq
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: trunk
        timestamp: Mon 2007-09-24 13:07:57 +0200
        message:
          Fix typo
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.27.2.1
        revision-id: v.ladeuil+lp at free.fr-20070924110505-4apfu3r909hamrtq
        parent: pqm at pqm.ubuntu.com-20070924102745-ohorpye5tifec1q3
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: doc
        timestamp: Mon 2007-09-24 13:05:05 +0200
        message:
          Fix typo.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.27
    revision-id: pqm at pqm.ubuntu.com-20070924102745-ohorpye5tifec1q3
    parent: pqm at pqm.ubuntu.com-20070924042807-nfjwj1voh6a8zddf
    parent: v.ladeuil+lp at free.fr-20070924094148-jqyqvapf3keqdcfx
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-09-24 11:27:45 +0100
    message:
      Fix #141382 by comparing real paths and various OSX fixes
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
      bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
      bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
      bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
      bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.26.1.1
        revision-id: v.ladeuil+lp at free.fr-20070924094148-jqyqvapf3keqdcfx
        parent: pqm at pqm.ubuntu.com-20070924042807-nfjwj1voh6a8zddf
        parent: v.ladeuil+lp at free.fr-20070924094001-k8z6tlxnlcimvg5a
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: trunk
        timestamp: Mon 2007-09-24 11:41:48 +0200
        message:
          Fix #141382 by comparing real paths and various OSX fixes
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
        ------------------------------------------------------------
        revno: 2776.2.18.1.29.1.14
        revision-id: v.ladeuil+lp at free.fr-20070924094001-k8z6tlxnlcimvg5a
        parent: v.ladeuil+lp at free.fr-20070924085356-g7mx4wdj2np35j37
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: osx.clean
        timestamp: Mon 2007-09-24 11:40:01 +0200
        message:
          Fix 141382 by comparing real paths.
          
          * bzrlib/tests/test_sftp_transport.py:
          (SFTPTransportTestRelative.test__remote_path): Use
          assertIsSameRealPath.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
        ------------------------------------------------------------
        revno: 2776.2.18.1.29.1.13
        revision-id: v.ladeuil+lp at free.fr-20070924085356-g7mx4wdj2np35j37
        parent: v.ladeuil+lp at free.fr-20070924084931-cce6o30w898zxs3z
        parent: pqm at pqm.ubuntu.com-20070924042807-nfjwj1voh6a8zddf
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: osx.clean
        timestamp: Mon 2007-09-24 10:53:56 +0200
        message:
          Merge bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
          bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
        ------------------------------------------------------------
        revno: 2776.2.18.1.29.1.12
        revision-id: v.ladeuil+lp at free.fr-20070924084931-cce6o30w898zxs3z
        parent: v.ladeuil+lp at free.fr-20070924084635-j9jaa8543zsjs7x7
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: osx.clean
        timestamp: Mon 2007-09-24 10:49:31 +0200
        message:
          NEWS should be in alphabetical order.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 2776.2.18.1.29.1.11
        revision-id: v.ladeuil+lp at free.fr-20070924084635-j9jaa8543zsjs7x7
        parent: v.ladeuil+lp at free.fr-20070923171824-1nyy7et3vuj96szg
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: osx.clean
        timestamp: Mon 2007-09-24 10:46:35 +0200
        message:
          Review feedback.
          
          * bzrlib/tests/test_sftp_transport.py:
          (SFTPTransportTestRelative.test__remote_path): Add comment to
          knownFailure.
          
          * bzrlib/tests/test_bundle.py:
          (BundleTester.test_unicode_bundle): Associate bug 141438 to
          knownFailure.
          
          * bzrlib/tests/__init__.py:
          (TestCase.assertIsSameRealPath): Show apparent paths in addition
          to real paths.
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
        ------------------------------------------------------------
        revno: 2776.2.18.1.29.1.10
        revision-id: v.ladeuil+lp at free.fr-20070923171824-1nyy7et3vuj96szg
        parent: v.ladeuil+lp at free.fr-20070920130159-1y6ey6oy9v6vuzql
        parent: pqm at pqm.ubuntu.com-20070922170226-ex2ydmlyboaoj87c
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: osx.clean
        timestamp: Sun 2007-09-23 19:18:24 +0200
        message:
          merge bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
          bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
          bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
          bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
          bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
          bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
          bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
          bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
          bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
          bzrlib/tuned_gzip.py           tuned_gzip.py-20060407014720-5aadc518e928e8d2
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 2776.2.18.1.29.1.9
        revision-id: v.ladeuil+lp at free.fr-20070920130159-1y6ey6oy9v6vuzql
        parent: v.ladeuil+lp at free.fr-20070920130129-ke3z09tj0dzqy1oq
        parent: pqm at pqm.ubuntu.com-20070920125023-upjqmzln7mjtvj1h
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: osx.pass.test.suite
        timestamp: Thu 2007-09-20 15:01:59 +0200
        message:
          Merge bzr.dev
        modified:
          bzrlib/tests/HttpServer.py     httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
        ------------------------------------------------------------
        revno: 2776.2.18.1.29.1.8
        revision-id: v.ladeuil+lp at free.fr-20070920130129-ke3z09tj0dzqy1oq
        parent: v.ladeuil+lp at free.fr-20070920111637-ks0vnmps8xmpzm3h
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: osx.pass.test.suite
        timestamp: Thu 2007-09-20 15:01:29 +0200
        message:
          Rewrite expected failure message
        modified:
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
        ------------------------------------------------------------
        revno: 2776.2.18.1.29.1.7
        revision-id: v.ladeuil+lp at free.fr-20070920111637-ks0vnmps8xmpzm3h
        parent: v.ladeuil+lp at free.fr-20070918081400-fx11853zky2twa97
        parent: pqm at pqm.ubuntu.com-20070920110135-652zsvb2su692bie
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: osx.pass.test.suite
        timestamp: Thu 2007-09-20 13:16:37 +0200
        message:
          Merge bzr.dev
        added:
          doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
          bzrlib/tests/HttpServer.py     httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
          bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
          bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
          bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
          bzrlib/tests/test_symbol_versioning.py test_symbol_versioning.py-20060105104851-51d7722c2018d42b
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/tests/test_weave.py     testknit.py-20050627023648-9833cc5562ffb785
          bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          bzrlib/weave.py                knit.py-20050627021749-759c29984154256b
          doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
        ------------------------------------------------------------
        revno: 2776.2.18.1.29.1.6
        revision-id: v.ladeuil+lp at free.fr-20070918081400-fx11853zky2twa97
        parent: v.ladeuil+lp at free.fr-20070917210847-hneglal34t75toin
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: osx.pass.test.suite
        timestamp: Tue 2007-09-18 10:14:00 +0200
        message:
          Redo minor fix.
          
          * bzrlib/tests/blackbox/test_too_much.py:
          (OldTests.test_bzr): Use assertIsSameRealPath.
        modified:
          bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
        ------------------------------------------------------------
        revno: 2776.2.18.1.29.1.5
        revision-id: v.ladeuil+lp at free.fr-20070917210847-hneglal34t75toin
        parent: v.ladeuil+lp at free.fr-20070917123431-065warglku51y822
        parent: pqm at pqm.ubuntu.com-20070917205427-yt8z43qj0756so3p
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: osx.pass.test.suite
        timestamp: Mon 2007-09-17 23:08:47 +0200
        message:
          Merge bzr.dev.
        added:
          bzrlib/reconfigure.py          reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
          bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
          bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
          bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/HttpServer.py     httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
          bzrlib/tests/blackbox/test_missing.py test_missing.py-20051211212735-a2cf4c1840bb84c4
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
          bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
          bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
          doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
        ------------------------------------------------------------
        revno: 2776.2.18.1.29.1.4
        revision-id: v.ladeuil+lp at free.fr-20070917123431-065warglku51y822
        parent: v.ladeuil+lp at free.fr-20070915110822-qamlabd07hmima6i
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: osx.pass.test.suite
        timestamp: Mon 2007-09-17 14:34:31 +0200
        message:
          Use assertIsSameRealPath to avoid OSX aliasing (specifically /tmp
          -> /private/tmp).
          
          * bzrlib/tests/__init__.py:
          (TestCase.assertIsSameRealPath): New method resolving symlinks
          before comparing paths.
          
          * bzrlib/tests/test_selftest.py:
          (TestTestCaseInTempDir.test_home_is_not_working,
          TestTestCaseWithMemoryTransport.test_home_is_non_existant_dir_under_root,
          TestTestCaseWithMemoryTransport.test_cwd_is_TEST_ROOT): Use
          assertIsSameRealPath.
          
          * bzrlib/tests/test_plugins.py:
          (TestPlugins.test_trivial_plugin_get_path): Use assertIsSameRealPath.
          
          * bzrlib/tests/test_sftp_transport.py:
          (SFTPTransportTestRelative.test__remote_path): The test should be
          totally rewritten for OSX. Marking it as know failure in the
          interim.
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
        ------------------------------------------------------------
        revno: 2776.2.18.1.29.1.3
        revision-id: v.ladeuil+lp at free.fr-20070915110822-qamlabd07hmima6i
        parent: v.ladeuil+lp at free.fr-20070914135618-72gmt7at7xx4utmp
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: osx.pass.test.suite
        timestamp: Sat 2007-09-15 13:08:22 +0200
        message:
          WorkingTree3 unicode related expected failure.
          
          * bzrlib/tests/test_bundle.py:
          (BundleTester.test_unicode_bundle): Catch expected test failure
          earlier. This one may need more investigation.
        modified:
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
        ------------------------------------------------------------
        revno: 2776.2.18.1.29.1.2
        revision-id: v.ladeuil+lp at free.fr-20070914135618-72gmt7at7xx4utmp
        parent: v.ladeuil+lp at free.fr-20070914135401-jonrm5thoh4vqt0e
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: osx.pass.test.suite
        timestamp: Fri 2007-09-14 15:56:18 +0200
        message:
          Minor fix.
          
          * bzrlib/tests/blackbox/test_too_much.py:
          (OldTests.test_bzr): On OSX ,/tmp is really /private/tmp.
        modified:
          bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
        ------------------------------------------------------------
        revno: 2776.2.18.1.29.1.1
        revision-id: v.ladeuil+lp at free.fr-20070914135401-jonrm5thoh4vqt0e
        parent: pqm at pqm.ubuntu.com-20070914082550-j9aknobh4x00qksk
        parent: v.ladeuil+lp at free.fr-20070914111435-i0hy1wvvtjyttxas
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: osx.pass.test.suite
        timestamp: Fri 2007-09-14 15:54:01 +0200
        message:
          Merge fix for #59150 as we want to test without medusa and without parmiko
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.26
    revision-id: pqm at pqm.ubuntu.com-20070924042807-nfjwj1voh6a8zddf
    parent: pqm at pqm.ubuntu.com-20070923210826-t3ymvo1l68z96in1
    parent: robertc at robertcollins.net-20070924022944-lv2e2glumuo3ne8q
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Mon 2007-09-24 05:28:07 +0100
    message:
      (robertc) Increase efficiency of shaing during adding of knit records. (Robert Collins)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.25.1.1
        revision-id: robertc at robertcollins.net-20070924022944-lv2e2glumuo3ne8q
        parent: pqm at pqm.ubuntu.com-20070923210826-t3ymvo1l68z96in1
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: knits
        timestamp: Mon 2007-09-24 12:29:44 +1000
        message:
          * ``KnitVersionedFile.add*`` will no longer cache added records even when
            enable_cache() has been called - the caching feature is now exclusively for
            reading existing data. (Robert Collins)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.25
    revision-id: pqm at pqm.ubuntu.com-20070923210826-t3ymvo1l68z96in1
    parent: pqm at pqm.ubuntu.com-20070923202533-vzfy37j7bpkwo21z
    parent: robertc at robertcollins.net-20070923203327-o2pztijk7aysuw9w
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2007-09-23 22:08:26 +0100
    message:
      (robertc) Tweak index -Devil tracing.
    modified:
      bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.24.1.1
        revision-id: robertc at robertcollins.net-20070923203327-o2pztijk7aysuw9w
        parent: pqm at pqm.ubuntu.com-20070923202533-vzfy37j7bpkwo21z
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: index
        timestamp: Mon 2007-09-24 06:33:27 +1000
        message:
          Tweak index -Devil tracing.
        modified:
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.24
    revision-id: pqm at pqm.ubuntu.com-20070923202533-vzfy37j7bpkwo21z
    parent: pqm at pqm.ubuntu.com-20070922170226-ex2ydmlyboaoj87c
    parent: robertc at robertcollins.net-20070923191242-zhem9hyu4s3iv0is
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2007-09-23 21:25:33 +0100
    message:
      (robertc) Various test fixes and tweaks for packs. (Robert Collins).
    modified:
      bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
      bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
      bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
      bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
      bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
      bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
      bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
        ------------------------------------------------------------
        revno: 2776.2.18.1.24.4.2
        revision-id: robertc at robertcollins.net-20070923191242-zhem9hyu4s3iv0is
        parent: robertc at robertcollins.net-20070914021941-wjd6iu3rnqarh07q
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: pack-support
        timestamp: Mon 2007-09-24 05:12:42 +1000
        message:
          Review feedback.
        modified:
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
        ------------------------------------------------------------
        revno: 2776.2.18.1.24.4.1
        revision-id: robertc at robertcollins.net-20070914021941-wjd6iu3rnqarh07q
        parent: pqm at pqm.ubuntu.com-20070913193317-hi3rhwxhbrviw7hz
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: pack-support
        timestamp: Fri 2007-09-14 12:19:41 +1000
        message:
          Various test fixes and tweaks for packs.
        modified:
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
          bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.23
    revision-id: pqm at pqm.ubuntu.com-20070922170226-ex2ydmlyboaoj87c
    parent: pqm at pqm.ubuntu.com-20070922162518-jn1nr11x32ep32mv
    parent: bialix at ukr.net-20070922162037-d1ym5gbli9utowto
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2007-09-22 18:02:26 +0100
    message:
      win32-specific fixes (bialix)
    modified:
      bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
      bzrlib/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
      bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
      bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
      bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
      bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.21.2.1
        revision-id: bialix at ukr.net-20070922162037-d1ym5gbli9utowto
        parent: pqm at pqm.ubuntu.com-20070921081743-jhdchcp1wiwmw0jv
        parent: bialix at ukr.net-20070920213249-z3v3qop4mhyj6lir
        parent: bialix at ukr.net-20070920214615-v1a3x1f05sgtrop2
        parent: bialix at ukr.net-20070921123048-l12m4d9h4tj8rzg6
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: approved.branch5
        timestamp: Sat 2007-09-22 19:20:37 +0300
        message:
          merge approved chunks
        modified:
          bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
          bzrlib/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
          bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
          bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
          bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
            ------------------------------------------------------------
            revno: 2776.2.18.1.31.1.14.4.1
            revision-id: bialix at ukr.net-20070920214615-v1a3x1f05sgtrop2
            parent: pqm at pqm.ubuntu.com-20070920125023-upjqmzln7mjtvj1h
            committer: Alexander Belchenko <bialix at ukr.net>
            branch nick: 2
            timestamp: Fri 2007-09-21 00:46:15 +0300
            message:
              provide non-empty locations.conf for test_branch.TestBranchFormat5.test_set_push_location
            modified:
              bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
            ------------------------------------------------------------
            revno: 2776.2.18.1.31.1.14.3.1
            revision-id: bialix at ukr.net-20070921123048-l12m4d9h4tj8rzg6
            parent: pqm at pqm.ubuntu.com-20070920125023-upjqmzln7mjtvj1h
            committer: Alexander Belchenko <bialix at ukr.net>
            branch nick: 5
            timestamp: Fri 2007-09-21 15:30:48 +0300
            message:
              using functions from osutils instead of os.path.*
            modified:
              bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
              bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
              bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
              bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
              bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
              bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.14.2.1
        revision-id: bialix at ukr.net-20070920213249-z3v3qop4mhyj6lir
        parent: pqm at pqm.ubuntu.com-20070920125023-upjqmzln7mjtvj1h
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: 1
        timestamp: Fri 2007-09-21 00:32:49 +0300
        message:
          multiparent.py: workaround for windows bug: .tell() for files opened in 'ab' mode before any write returns 0
        modified:
          bzrlib/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.22
    revision-id: pqm at pqm.ubuntu.com-20070922162518-jn1nr11x32ep32mv
    parent: pqm at pqm.ubuntu.com-20070921081743-jhdchcp1wiwmw0jv
    parent: bialix at ukr.net-20070922154348-dte2o3le0f8n30iq
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2007-09-22 17:25:18 +0100
    message:
      Trivial fix for 'bzr reconfigure' (Rob Weir)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.21.1.4
        revision-id: bialix at ukr.net-20070922154348-dte2o3le0f8n30iq
        parent: rweir at ertius.org-20070922060835-kg519btg6kiyuf4y
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: rob.weir
        timestamp: Sat 2007-09-22 18:43:48 +0300
        message:
          NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.21.1.3
        revision-id: rweir at ertius.org-20070922060835-kg519btg6kiyuf4y
        parent: rweir at ertius.org-20070922004044-0s4vv2q6e7bdovms
        committer: Rob Weir <rweir at ertius.org>
        branch nick: bzr-reconfigure-with-no-args
        timestamp: Sat 2007-09-22 16:08:35 +1000
        message:
          add check of error text.
        modified:
          bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.21.1.2
        revision-id: rweir at ertius.org-20070922004044-0s4vv2q6e7bdovms
        parent: rweir at ertius.org-20070921234816-ixwjcntu98m0t1vb
        committer: Rob Weir <rweir at ertius.org>
        branch nick: bzr-reconfigure-with-no-args
        timestamp: Sat 2007-09-22 10:40:44 +1000
        message:
          use BzrCommandError from imported name 'errors'.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.21.1.1
        revision-id: rweir at ertius.org-20070921234816-ixwjcntu98m0t1vb
        parent: pqm at pqm.ubuntu.com-20070921081743-jhdchcp1wiwmw0jv
        committer: Rob Weir <rweir at ertius.org>
        branch nick: bzr-reconfigure-with-no-args
        timestamp: Sat 2007-09-22 09:48:16 +1000
        message:
          add blackbox test for 'bzr reconfigure', which now fails.
        modified:
          bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.21
    revision-id: pqm at pqm.ubuntu.com-20070921081743-jhdchcp1wiwmw0jv
    parent: pqm at pqm.ubuntu.com-20070921064952-v0xvjk4fo14c0p7a
    parent: robertc at robertcollins.net-20070921070831-53v2gzumoto1phf8
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-09-21 09:17:43 +0100
    message:
      (robertc) Push the special casing of text adding with random ids further down the stack avoiding many miss-case index lookups. (Robert Collins)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.16.2.2
        revision-id: robertc at robertcollins.net-20070921070831-53v2gzumoto1phf8
        parent: robertc at robertcollins.net-20070921063509-7ohd4716ecor5d30
        parent: pqm at pqm.ubuntu.com-20070921051316-85muv96iv0duh31j
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Fri 2007-09-21 17:08:31 +1000
        message:
          Merge bzr.dev.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
          bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
          bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
          bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
          bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 2776.2.18.1.31.1.16.2.1
        revision-id: robertc at robertcollins.net-20070921063509-7ohd4716ecor5d30
        parent: pqm at pqm.ubuntu.com-20070921005024-anlkzk5nrdtujta4
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: knits
        timestamp: Fri 2007-09-21 16:35:09 +1000
        message:
          * Commit no longer checks for new text keys during insertion when the
            revision id was deterministically unique. (Robert Collins)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.20
    revision-id: pqm at pqm.ubuntu.com-20070921064952-v0xvjk4fo14c0p7a
    parent: pqm at pqm.ubuntu.com-20070921051316-85muv96iv0duh31j
    parent: mbp at sourcefrog.net-20070921061309-6uwzovw08llb2zdz
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2007-09-21 07:49:52 +0100
    message:
      show locale, encodings, plugins in error tracebacks (mbp)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
      bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
      bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.17.1.2
    revision-id: mbp at sourcefrog.net-20070921061309-6uwzovw08llb2zdz
    parent: mbp at sourcefrog.net-20070921030710-koafxqdakilf56t8
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: trivial
    timestamp: Fri 2007-09-21 16:13:09 +1000
    message:
      Also include plugin path and version in traceback
    modified:
      bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
      bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
    ------------------------------------------------------------
    revno: 2776.2.18.1.31.1.17.1.1
    revision-id: mbp at sourcefrog.net-20070921030710-koafxqdakilf56t8
    parent: pqm at pqm.ubuntu.com-20070921022023-cgeid5vrxco9o4jo
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: trivial
    timestamp: Fri 2007-09-21 13:07:10 +1000
    message:
      Report locale, encodings and plugins in traceback
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
      bzrlib/tests/test_trace.py     testtrace.py-20051110225523-a21117fc7a07eeff
      bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a

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



More information about the bazaar-commits mailing list