Rev 3309: merge bzr.dev in file:///v/home/vila/src/bzr/experimental/faster-selftest/

Vincent Ladeuil v.ladeuil+lp at free.fr
Sun Mar 30 21:16:49 BST 2008


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

------------------------------------------------------------
revno: 3309
revision-id: v.ladeuil+lp at free.fr-20080330201640-cqg11m8ay5bn095n
parent: v.ladeuil+lp at free.fr-20080326214331-khydifx3q86yqgqm
parent: pqm at pqm.ubuntu.com-20080330070256-7jn50o1dkbqbtvsh
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: test-suite-fixes
timestamp: Sun 2008-03-30 22:16:40 +0200
message:
  merge bzr.dev
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
  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/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
  bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
  bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
  bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
  bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
  bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
  bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
  bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
  bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
  bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
  bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
  bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  doc/developers/repository.txt  repository.txt-20070709152006-xkhlek456eclha4u-1
  doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
  doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
  doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
  doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
  doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
  doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
    ------------------------------------------------------------
    revno: 3302.3.14
    revision-id: pqm at pqm.ubuntu.com-20080330070256-7jn50o1dkbqbtvsh
    parent: pqm at pqm.ubuntu.com-20080329121122-edbj8ht3fbr35nfs
    parent: bialix at ukr.net-20080319094124-xvqxwvdv1ms2yxb2
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sun 2008-03-30 08:02:56 +0100
    message:
      (bialix) trivial correction in doc/developers/repository.txt
    modified:
      doc/developers/repository.txt  repository.txt-20070709152006-xkhlek456eclha4u-1
        ------------------------------------------------------------
        revno: 3293.3.1
        revision-id: bialix at ukr.net-20080319094124-xvqxwvdv1ms2yxb2
        parent: pqm at pqm.ubuntu.com-20080318024945-zhs03078h06fbk6l
        committer: Alexander Belchenko <bialix at ukr.net>
        branch nick: trivial
        timestamp: Wed 2008-03-19 11:41:24 +0200
        message:
          typo fixed in doc/developers/repository.txt
        modified:
          doc/developers/repository.txt  repository.txt-20070709152006-xkhlek456eclha4u-1
    ------------------------------------------------------------
    revno: 3302.3.13
    revision-id: pqm at pqm.ubuntu.com-20080329121122-edbj8ht3fbr35nfs
    parent: pqm at pqm.ubuntu.com-20080328090406-vc3xtc517r5z96bp
    parent: john at arbash-meinel.com-20080315140755-5d1bxutgwx4bnnt8
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Sat 2008-03-29 12:11:22 +0000
    message:
      (jam) avoid opening the master branch during update when it isn't
      	used.
    modified:
      bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
        ------------------------------------------------------------
        revno: 3280.5.1
        revision-id: john at arbash-meinel.com-20080315140755-5d1bxutgwx4bnnt8
        parent: pqm at pqm.ubuntu.com-20080315174441-l8xpw6femn0syal1
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: remove_master_open
        timestamp: Sat 2008-03-15 14:07:55 +0000
        message:
          Avoid opening the master branch when we won't use it.
        modified:
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
    ------------------------------------------------------------
    revno: 3302.3.12
    revision-id: pqm at pqm.ubuntu.com-20080328090406-vc3xtc517r5z96bp
    parent: pqm at pqm.ubuntu.com-20080328064220-ongijg78bfqhvbay
    parent: ian.clatworthy at canonical.com-20080328072455-0xlxool8cm4ibem8
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-03-28 09:04:06 +0000
    message:
      Improve doc on send/merge relationship (Peter Schuller)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3302.12.1
        revision-id: ian.clatworthy at canonical.com-20080328072455-0xlxool8cm4ibem8
        parent: pqm at pqm.ubuntu.com-20080328064220-ongijg78bfqhvbay
        parent: peter.schuller at infidyne.com-20080325231229-w8gguy6uy43z0x63
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: ianc-integration
        timestamp: Fri 2008-03-28 17:24:55 +1000
        message:
          Improve doc on send/merge relationship (Peter Schuller)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3277.1.4
        revision-id: peter.schuller at infidyne.com-20080325231229-w8gguy6uy43z0x63
        parent: peter.schuller at infidyne.com-20080316191535-arbxlus1moh3jtif
        committer: Peter Schuller <peter.schuller at infidyne.com>
        branch nick: bzr.scode
        timestamp: Wed 2008-03-26 00:12:29 +0100
        message:
          As per further feedback, use LOCATION instead of MERGE_OR_MERGE_DIRECTIVE.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3277.1.3
        revision-id: peter.schuller at infidyne.com-20080316191535-arbxlus1moh3jtif
        parent: peter.schuller at infidyne.com-20080316190548-ok3lx0y4dpgwhqtq
        committer: Peter Schuller <peter.schuller at infidyne.com>
        branch nick: bzr.scode
        timestamp: Sun 2008-03-16 20:15:35 +0100
        message:
          Identify by name the "cherrypicking" mode of operation of 'bzr merge'.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3277.1.2
        revision-id: peter.schuller at infidyne.com-20080316190548-ok3lx0y4dpgwhqtq
        parent: peter.schuller at infidyne.com-20080314214745-rcrc2rtxp2w3g2hj
        committer: Peter Schuller <peter.schuller at infidyne.com>
        branch nick: bzr.scode
        timestamp: Sun 2008-03-16 20:05:48 +0100
        message:
          As per feedback to previous attempt:
            - use branch_or_merge_directive instead of branch|merge_directive
            - make corresponding changes to run()
            - slight phrasing changes, including a bit of the old merge
              paragraph that was not changed by the previous attempt
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
        ------------------------------------------------------------
        revno: 3277.1.1
        revision-id: peter.schuller at infidyne.com-20080314214745-rcrc2rtxp2w3g2hj
        parent: pqm at pqm.ubuntu.com-20080314211658-bjlcjsk0zl2ppcai
        committer: Peter Schuller <peter.schuller at infidyne.com>
        branch nick: bzr.scode
        timestamp: Fri 2008-03-14 22:47:45 +0100
        message:
          Document the relationship between bzr send and bzr merge. In
          particular, be explicit about the support for merge directives in the
          documentation of the merge command.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
    ------------------------------------------------------------
    revno: 3302.3.11
    revision-id: pqm at pqm.ubuntu.com-20080328064220-ongijg78bfqhvbay
    parent: pqm at pqm.ubuntu.com-20080328032801-o2sda79zu2g6ckxg
    parent: robertc at robertcollins.net-20080328045853-ieqn8amdd8a1eon4
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-03-28 06:42:20 +0000
    message:
      Deprecate a number of VersionedFile method calls,
      	and Repository.get_revision_graph. (Robert Collins)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      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/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
      bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
      bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
      bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
      bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
      bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
      bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
      bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
      bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
        ------------------------------------------------------------
        revno: 3287.6.9
        revision-id: robertc at robertcollins.net-20080328045853-ieqn8amdd8a1eon4
        parent: robertc at robertcollins.net-20080328035440-4cflvryqujresn2g
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: integration
        timestamp: Fri 2008-03-28 15:58:53 +1100
        message:
          One last use of deprecated methods.
        modified:
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
        ------------------------------------------------------------
        revno: 3287.6.8
        revision-id: robertc at robertcollins.net-20080328035440-4cflvryqujresn2g
        parent: robertc at robertcollins.net-20080327045412-rju4uoh3glidd2px
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: versionedfile.apicleanup
        timestamp: Fri 2008-03-28 14:54:40 +1100
        message:
          Reduce code duplication as per review.
        modified:
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
        ------------------------------------------------------------
        revno: 3287.6.7
        revision-id: robertc at robertcollins.net-20080327045412-rju4uoh3glidd2px
        parent: robertc at robertcollins.net-20080327041759-8b7gao08zdz99dei
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: versionedfile.apicleanup
        timestamp: Thu 2008-03-27 15:54:12 +1100
        message:
           * ``VersionedFile.get_graph_with_ghosts`` is deprecated, with no
             replacement method.  The method was size(history) and not desirable.
             (Robert Collins)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
        ------------------------------------------------------------
        revno: 3287.6.6
        revision-id: robertc at robertcollins.net-20080327041759-8b7gao08zdz99dei
        parent: robertc at robertcollins.net-20080327012524-yfgr0lek5ckiowhn
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: versionedfile.apicleanup
        timestamp: Thu 2008-03-27 15:17:59 +1100
        message:
          Unbreak has_ghosts.
        modified:
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
        ------------------------------------------------------------
        revno: 3287.6.5
        revision-id: robertc at robertcollins.net-20080327012524-yfgr0lek5ckiowhn
        parent: robertc at robertcollins.net-20080327002741-1vrg4yekrlvv4lfn
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: versionedfile.apicleanup
        timestamp: Thu 2008-03-27 12:25:24 +1100
        message:
          Deprecate VersionedFile.has_ghost.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
          bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
        ------------------------------------------------------------
        revno: 3287.6.4
        revision-id: robertc at robertcollins.net-20080327002741-1vrg4yekrlvv4lfn
        parent: robertc at robertcollins.net-20080326215555-d8f6bca03zxtzmsb
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: versionedfile.apicleanup
        timestamp: Thu 2008-03-27 11:27:41 +1100
        message:
          Fix up deprecation warnings for get_revision_graph.
        modified:
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
        ------------------------------------------------------------
        revno: 3287.6.3
        revision-id: robertc at robertcollins.net-20080326215555-d8f6bca03zxtzmsb
        parent: robertc at robertcollins.net-20080326215332-0gdkjjcl3kxyeysq
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: versionedfile.apicleanup
        timestamp: Thu 2008-03-27 08:55:55 +1100
        message:
          More deprecations for NEWS.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3287.6.2
        revision-id: robertc at robertcollins.net-20080326215332-0gdkjjcl3kxyeysq
        parent: robertc at robertcollins.net-20080326214235-3wmnqamcgytwif89
        parent: pqm at pqm.ubuntu.com-20080326124829-ggl5f8711x321ahw
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: versionedfile.apicleanup
        timestamp: Thu 2008-03-27 08:53:32 +1100
        message:
          Merge bzr.dev.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
          bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
          bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
          bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
          bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
        ------------------------------------------------------------
        revno: 3287.6.1
        revision-id: robertc at robertcollins.net-20080326214235-3wmnqamcgytwif89
        parent: robertc at robertcollins.net-20080326011541-h9cxdap8x5pafq13
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: versionedfile.apicleanup
        timestamp: Thu 2008-03-27 08:42:35 +1100
        message:
           * ``VersionedFile.get_graph`` is deprecated, with no replacement method.
             The method was size(history) and not desirable. (Robert Collins)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
          bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
          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/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
          bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
          bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
          bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
    ------------------------------------------------------------
    revno: 3302.3.10
    revision-id: pqm at pqm.ubuntu.com-20080328032801-o2sda79zu2g6ckxg
    parent: pqm at pqm.ubuntu.com-20080327163915-wtpepv5kq5hm42zv
    parent: ian.clatworthy at canonical.com-20080328014920-hbtesze2sw6yfls6
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-03-28 03:28:01 +0000
    message:
      Reduced the evangelism in the User Guide (Ian Clatworthy)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
      doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
      doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
      doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
        ------------------------------------------------------------
        revno: 3302.11.1
        revision-id: ian.clatworthy at canonical.com-20080328014920-hbtesze2sw6yfls6
        parent: pqm at pqm.ubuntu.com-20080327163915-wtpepv5kq5hm42zv
        parent: ian.clatworthy at canonical.com-20080327075110-afgd7x03ybju06ez
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: ianc-integration
        timestamp: Fri 2008-03-28 11:49:20 +1000
        message:
          Reduced the evangelism in the User Guide (Ian Clatworthy)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
          doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
          doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
          doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
        ------------------------------------------------------------
        revno: 3302.10.1
        revision-id: ian.clatworthy at canonical.com-20080327075110-afgd7x03ybju06ez
        parent: pqm at pqm.ubuntu.com-20080327022136-3r7xq97mm5j5s1x6
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: bzr.ug1-refresh
        timestamp: Thu 2008-03-27 17:51:10 +1000
        message:
          Reduce evangelism in the User Guide
        modified:
          doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
          doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-1
          doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
          doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
    ------------------------------------------------------------
    revno: 3302.3.9
    revision-id: pqm at pqm.ubuntu.com-20080327163915-wtpepv5kq5hm42zv
    parent: pqm at pqm.ubuntu.com-20080327064129-8egj1nnju8z9v91b
    parent: v.ladeuil+lp at free.fr-20080327150604-gsasqldpbdivo1d9
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-03-27 16:39:15 +0000
    message:
      (vila) Add sanity checks to selftest --load-list
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
        ------------------------------------------------------------
        revno: 3302.9.1
        revision-id: v.ladeuil+lp at free.fr-20080327150604-gsasqldpbdivo1d9
        parent: pqm at pqm.ubuntu.com-20080327064129-8egj1nnju8z9v91b
        parent: v.ladeuil+lp at free.fr-20080327145707-0brs5r07cfuk3fhj
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: trunk
        timestamp: Thu 2008-03-27 16:06:04 +0100
        message:
          Add sanity checks to selftest --load-list
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
        ------------------------------------------------------------
        revno: 3302.1.3
        revision-id: v.ladeuil+lp at free.fr-20080327145707-0brs5r07cfuk3fhj
        parent: v.ladeuil+lp at free.fr-20080326214255-02rhczp1uixzhvsm
        committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
        branch nick: check-id-filtering
        timestamp: Thu 2008-03-27 15:57:07 +0100
        message:
          Fix PEP8 catched by Aaron. Update NEWS.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
    ------------------------------------------------------------
    revno: 3302.3.8
    revision-id: pqm at pqm.ubuntu.com-20080327064129-8egj1nnju8z9v91b
    parent: pqm at pqm.ubuntu.com-20080327022136-3r7xq97mm5j5s1x6
    parent: ian.clatworthy at canonical.com-20080327045730-imw32ail0iz0msmb
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-03-27 06:41:29 +0000
    message:
      (Matthew Fuller) Trivial User Guide fixes (igc)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
      doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
        ------------------------------------------------------------
        revno: 3302.8.1
        revision-id: ian.clatworthy at canonical.com-20080327045730-imw32ail0iz0msmb
        parent: pqm at pqm.ubuntu.com-20080326124829-ggl5f8711x321ahw
        parent: fullermd at over-yonder.net-20080327005519-hp1uy5d1x92qfhfw
        committer: Ian Clatworthy <ian.clatworthy at canonical.com>
        branch nick: ianc-integration
        timestamp: Thu 2008-03-27 14:57:30 +1000
        message:
          (Matthew Fuller) Trivial User Guide fixes
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
          doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
        ------------------------------------------------------------
        revno: 3302.7.3
        revision-id: fullermd at over-yonder.net-20080327005519-hp1uy5d1x92qfhfw
        parent: fullermd at over-yonder.net-20080327000602-mupzgfeqdsv6ujqj
        committer: Matthew Fuller <fullermd at over-yonder.net>
        branch nick: guide-fixes
        timestamp: Wed 2008-03-26 19:55:19 -0500
        message:
          Using revert to back out a revision's fix is only really meaningful if
          it's the last revision.  If it's not, you really want 'Reverse
          cherrypicking' instead.  Slip an explanation and cross-reference in
          after the example.
        modified:
          doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
        ------------------------------------------------------------
        revno: 3302.7.2
        revision-id: fullermd at over-yonder.net-20080327000602-mupzgfeqdsv6ujqj
        parent: fullermd at over-yonder.net-20080326165239-70h07p1jk35mn1vc
        committer: Matthew Fuller <fullermd at over-yonder.net>
        branch nick: guide-fixes
        timestamp: Wed 2008-03-26 19:06:02 -0500
        message:
          There's nothing straight about a straitjacket.
        modified:
          doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
        ------------------------------------------------------------
        revno: 3302.7.1
        revision-id: fullermd at over-yonder.net-20080326165239-70h07p1jk35mn1vc
        parent: pqm at pqm.ubuntu.com-20080325070104-4k2nyfye5v0sublz
        committer: Matthew Fuller <fullermd at over-yonder.net>
        branch nick: guide-fixes
        timestamp: Wed 2008-03-26 11:52:39 -0500
        message:
          If you want to get rid of the changes you made in rev20, you want to
          revert to 19, not 20.
        modified:
          doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
    ------------------------------------------------------------
    revno: 3302.3.7
    revision-id: pqm at pqm.ubuntu.com-20080327022136-3r7xq97mm5j5s1x6
    parent: pqm at pqm.ubuntu.com-20080326124829-ggl5f8711x321ahw
    parent: andrew.bennetts at canonical.com-20080326221509-ggzura2egh8msa3z
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Thu 2008-03-27 02:21:36 +0000
    message:
      Move smart protocol version query logic into the medium,
      	so that we no longer make redundant version queries. (Andrew Bennetts)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
      bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
      bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
      bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
      bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
      bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
    ------------------------------------------------------------
    revno: 3241.1.8
    revision-id: andrew.bennetts at canonical.com-20080326221509-ggzura2egh8msa3z
    parent: andrew.bennetts at canonical.com-20080326220305-4cur6a0c9kmyyn6c
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: protocol-versioning-logic-into-medium
    timestamp: Thu 2008-03-27 09:15:09 +1100
    message:
      Add NEWS entry.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3241.1.7
    revision-id: andrew.bennetts at canonical.com-20080326220305-4cur6a0c9kmyyn6c
    parent: andrew.bennetts at canonical.com-20080326220030-91y3ze0721oix2bz
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: protocol-versioning-logic-into-medium
    timestamp: Thu 2008-03-27 09:03:05 +1100
    message:
      Remove unused imports from bzrlib/transport/__init__.py.
    modified:
      bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
    ------------------------------------------------------------
    revno: 3241.1.6
    revision-id: andrew.bennetts at canonical.com-20080326220030-91y3ze0721oix2bz
    parent: andrew.bennetts at canonical.com-20080326214402-cpdwd79w1uu2c8un
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: protocol-versioning-logic-into-medium
    timestamp: Thu 2008-03-27 09:00:30 +1100
    message:
      Deprecate Transport.get_smart_client and errors.NoSmartServer, as these are now unused.
    modified:
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
      bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
      bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
    ------------------------------------------------------------
    revno: 3241.1.5
    revision-id: andrew.bennetts at canonical.com-20080326214402-cpdwd79w1uu2c8un
    parent: andrew.bennetts at canonical.com-20080326095048-8eo3qp3w4rhamtt4
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: protocol-versioning-logic-into-medium
    timestamp: Thu 2008-03-27 08:44:02 +1100
    message:
      Add comment suggested by Robert.
    modified:
      bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
    ------------------------------------------------------------
    revno: 3241.1.4
    revision-id: andrew.bennetts at canonical.com-20080326095048-8eo3qp3w4rhamtt4
    parent: andrew.bennetts at canonical.com-20080326064904-3ja75n1zbggmgx5w
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: protocol-versioning-logic-into-medium
    timestamp: Wed 2008-03-26 20:50:48 +1100
    message:
      Use get_smart_medium as suggested by Robert, and deal with the fallout.
    modified:
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
      bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
      bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
    ------------------------------------------------------------
    revno: 3241.1.3
    revision-id: andrew.bennetts at canonical.com-20080326064904-3ja75n1zbggmgx5w
    parent: andrew.bennetts at canonical.com-20080228142120-0kxund2mhm7ne5sh
    parent: pqm at pqm.ubuntu.com-20080326030652-vgwdkwda9mi8s200
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: protocol-versioning-logic-into-medium
    timestamp: Wed 2008-03-26 17:49:04 +1100
    message:
      Merge bzr.dev.
    added:
      bzrlib/directory_service.py    directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
      bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
      bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
      bzrlib/tests/test_uncommit.py  test_uncommit.py-20080316104338-y3gxu67g5m2qih10-1
      bzrlib/tests/tree_implementations/test_annotate_iter.py test_annotate_iter.p-20080315092519-h4dc43rntmfmq16d-1
      doc/en/admin-guide/            docenadminguide-20080305135054-y7y2c986yf94zljn-1
      doc/en/admin-guide/index.txt   index.txt-20080305140741-ecw0lap8dxkxc05g-1
    renamed:
      bzrlib/plugins/launchpad/lp_indirect.py => bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
      bzrlib/plugins/launchpad/test_lp_indirect.py => bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      README                         README-20050309040720-8f368abf9f346b9d
      bzr                            bzr.py-20050313053754-5485f144c7006fa6
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
      bzrlib/_knit_load_data_c.pyx   knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
      bzrlib/_knit_load_data_py.py   _knit_load_data_py.p-20070629000948-9a0nh4s118bi5y8n-1
      bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/bundle/__init__.py      changeset.py-20050513021216-b02ab57fb9738913
      bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/cmd_version_info.py     __init__.py-20051228204928-697d01fdca29c99b
      bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
      bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
      bzrlib/deprecated_graph.py     graph.py-20050905070950-b47dce53236c5e48
      bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
      bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
      bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
      bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      bzrlib/mail_client.py          mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
      bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
      bzrlib/merge3.py               merge3.py-20050704130834-bf0597094828a2e1
      bzrlib/merge_directive.py      merge_directive.py-20070228184838-ja62280spt1g7f4x-1
      bzrlib/missing.py              missing.py-20050812153334-097f7097e2a8bcd1
      bzrlib/multiparent.py          __init__.py-20070410133617-n1jdhcc1n1mibarp-1
      bzrlib/option.py               option.py-20051014052914-661fb36e76e7362f
      bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
      bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
      bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
      bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
      bzrlib/registry.py             lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
      bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
      bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
      bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
      bzrlib/smart/client.py         client.py-20061116014825-2k6ada6xgulslami-1
      bzrlib/smart/repository.py     repository.py-20061128022038-vr5wy5bubyb8xttk-1
      bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
      bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
      bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
      bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
      bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
      bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
      bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
      bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
      bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
      bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
      bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
      bzrlib/tests/blackbox/test_version_info.py test_bb_version_info.py-20051228204928-91711c6559d952f7
      bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
      bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
      bzrlib/tests/branch_implementations/test_revision_history.py test_revision_histor-20070326062311-v7co92liyuchb80w-1
      bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
      bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
      bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
      bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
      bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
      bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
      bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
      bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
      bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
      bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
      bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
      bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
      bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
      bzrlib/tests/test_merge3.py    merge3.py-20050704130834-556689114c89e6f2
      bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
      bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
      bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
      bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
      bzrlib/tests/test_registry.py  test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-2
      bzrlib/tests/test_revision.py  testrevision.py-20050804210559-46f5e1eb67b01289
      bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
      bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
      bzrlib/tests/test_tsort.py     testtsort.py-20051025073946-27da871c394d5be4
      bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
      bzrlib/tests/test_urlutils.py  test_urlutils.py-20060502192900-46b1f9579987cf9c
      bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
      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_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
      bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
      bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
      bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
      bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
      bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
      bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
      bzrlib/tsort.py                tsort.py-20051025073946-7808f6aaf7d07208
      bzrlib/ui/__init__.py          ui.py-20050824083933-8cf663c763ba53a9
      bzrlib/uncommit.py             uncommit.py-20050626215513-5ec509fa425b305c
      bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
      bzrlib/urlutils.py             urlutils.py-20060502195429-e8a161ecf8fac004
      bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
      bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
      bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
      bzrlib/version.py              version.py-20060816024207-ves6ult9a11taj9t-1
      bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
      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
      doc/developers/lca-merge.txt   lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
      doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
      doc/en/user-guide/hooks.txt    hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
      doc/en/user-guide/resolving_conflicts.txt resolving_conflicts.-20071122141511-0knao2lklsdsvb1q-5
      doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
      setup.py                       setup.py-20050314065409-02f8a0a6e3f9bc70
      bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
      bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
    ------------------------------------------------------------
    revno: 3241.1.2
    revision-id: andrew.bennetts at canonical.com-20080228142120-0kxund2mhm7ne5sh
    parent: andrew.bennetts at canonical.com-20080228140605-kj7oeq417cxk2l9b
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: protocol-versioning-api
    timestamp: Fri 2008-02-29 01:21:20 +1100
    message:
      Tidy comments.
    modified:
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
    ------------------------------------------------------------
    revno: 3241.1.1
    revision-id: andrew.bennetts at canonical.com-20080228140605-kj7oeq417cxk2l9b
    parent: pqm at pqm.ubuntu.com-20080228032258-4mdmqlx603ak6x2w
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: protocol-versioning-api
    timestamp: Fri 2008-02-29 01:06:05 +1100
    message:
      Shift protocol version querying from RemoteBzrDirFormat into SmartClientMedium.
    modified:
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/smart/medium.py         medium.py-20061103051856-rgu2huy59fkz902q-1
      bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
-------------- next part --------------

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


More information about the bazaar-commits mailing list