Rev 3890: Merge bzr.dev, resolve NEWS in http://bzr.arbash-meinel.com/branches/bzr/1.11/differ_serializer

John Arbash Meinel john at arbash-meinel.com
Wed Dec 10 00:10:27 GMT 2008


At http://bzr.arbash-meinel.com/branches/bzr/1.11/differ_serializer

------------------------------------------------------------
revno: 3890
revision-id: john at arbash-meinel.com-20081210001000-xsgsn2kt5ce6dfl2
parent: john at arbash-meinel.com-20081207173303-ydamo2rxs3ngjhw0
parent: pqm at pqm.ubuntu.com-20081209163533-fj6hx9l65sretbai
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: differ_serializer
timestamp: Tue 2008-12-09 18:10:00 -0600
message:
  Merge bzr.dev, resolve NEWS
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/registry.py             lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
  bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
  bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
  bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
  bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
  bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
  bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
    ------------------------------------------------------------
    revno: 3879.2.6
    revision-id: pqm at pqm.ubuntu.com-20081209163533-fj6hx9l65sretbai
    parent: pqm at pqm.ubuntu.com-20081209155126-st6whj38jx3nl0ft
    parent: john at arbash-meinel.com-20081208194402-v50vbmybtyiojlk5
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-12-09 16:35:33 +0000
    message:
      (jam) Default to urllib for http and pycurl for https
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
        ------------------------------------------------------------
        revno: 3879.5.1
        revision-id: john at arbash-meinel.com-20081208194402-v50vbmybtyiojlk5
        parent: pqm at pqm.ubuntu.com-20081205181554-ofrdnafloc43bxkh
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: default_urllib
        timestamp: Mon 2008-12-08 13:44:02 -0600
        message:
          Use urllib for http connections, pycurl for https connections.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
    ------------------------------------------------------------
    revno: 3879.2.5
    revision-id: pqm at pqm.ubuntu.com-20081209155126-st6whj38jx3nl0ft
    parent: pqm at pqm.ubuntu.com-20081209023452-12dbzcwzxrt1xee3
    parent: aaron at aaronbentley.com-20081209151508-nd1jb1vv2z22llwm
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-12-09 15:51:26 +0000
    message:
      Pull -v respects log_format config var (abentley)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
        ------------------------------------------------------------
        revno: 3848.1.5
        revision-id: aaron at aaronbentley.com-20081209151508-nd1jb1vv2z22llwm
        parent: aaron at aaronbentley.com-20081209033614-3zjvk6v47u039uzd
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: pull-log
        timestamp: Tue 2008-12-09 07:15:08 -0800
        message:
          Updates from review
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
        ------------------------------------------------------------
        revno: 3848.1.4
        revision-id: aaron at aaronbentley.com-20081209033614-3zjvk6v47u039uzd
        parent: aaron at aaronbentley.com-20081209033407-zrrszq9wddwln1y2
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: pull-log
        timestamp: Mon 2008-12-08 19:36:14 -0800
        message:
          Add NEWS entry
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3848.1.3
        revision-id: aaron at aaronbentley.com-20081209033407-zrrszq9wddwln1y2
        parent: aaron at aaronbentley.com-20081209014107-w3v6jg9302mewvd0
        parent: pqm at pqm.ubuntu.com-20081209023452-12dbzcwzxrt1xee3
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: pull-log
        timestamp: Mon 2008-12-08 19:34:07 -0800
        message:
          Merge bzr.dev into pull-log.
        added:
          bzrlib/foreign.py              foreign.py-20081112170002-olsxmandkk8qyfuq-1
          bzrlib/tests/test_foreign.py   test_foreign.py-20081125004048-ywb901edgp9lluxo-1
          contrib/convert_to_1.9.py      convert_to_dev2.py-20081014130524-z1ydl3mq9b4ehlvv-1
          tools/win32/build_release.py   build_release.py-20081105204355-2ghh5cv01v1x4rzz-1
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzr                            bzr.py-20050313053754-5485f144c7006fa6
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
          bzrlib/_patiencediff_c.c       _patiencediff_c.c-20070721205602-q3imkipwlgagp3cy-1
          bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
          bzrlib/btree_index.py          index.py-20080624222253-p0x5f92uyh5hw734-7
          bzrlib/bugtracker.py           bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
          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/fetch.py                fetch.py-20050818234941-26fea6105696365d
          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/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
          bzrlib/registry.py             lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
          bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
          bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
          bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
          bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
          bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
          bzrlib/tests/commands/test_commit.py test_commit.py-20070913161801-ydrx2k5gmv7k7eiu-1
          bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
          bzrlib/tests/per_repository/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
          bzrlib/tests/per_repository/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/per_repository/test_revision.py testrevprops.py-20051013073044-92bc3c68302ce1bf
          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_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
          bzrlib/tests/test_remote.py    test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
          bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
          bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
          bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
          bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
          bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
          doc/developers/ppa.txt         ppa.txt-20080722055539-606u7t2z32t3ae4w-1
        ------------------------------------------------------------
        revno: 3848.1.2
        revision-id: aaron at aaronbentley.com-20081209014107-w3v6jg9302mewvd0
        parent: aaron at aaronbentley.com-20081209013728-43v0yz6mo2jfexqv
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: pull-log
        timestamp: Mon 2008-12-08 17:41:07 -0800
        message:
          Make test stricter
        modified:
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
        ------------------------------------------------------------
        revno: 3848.1.1
        revision-id: aaron at aaronbentley.com-20081209013728-43v0yz6mo2jfexqv
        parent: pqm at pqm.ubuntu.com-20081125021810-2dhu9lqkn6nh5bhn
        committer: Aaron Bentley <aaron at aaronbentley.com>
        branch nick: pull-log
        timestamp: Mon 2008-12-08 17:37:28 -0800
        message:
          Use default log format in pull -v
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
    ------------------------------------------------------------
    revno: 3879.2.4
    revision-id: pqm at pqm.ubuntu.com-20081209023452-12dbzcwzxrt1xee3
    parent: pqm at pqm.ubuntu.com-20081205181554-ofrdnafloc43bxkh
    parent: mbp at sourcefrog.net-20081209014956-mbak0aw0zrprcido
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Tue 2008-12-09 02:34:52 +0000
    message:
      (mbp) Don't call iteritems on transport_list_registry, because it may change during iteration
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/registry.py             lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
      bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
        ------------------------------------------------------------
        revno: 3879.4.2
        revision-id: mbp at sourcefrog.net-20081209014956-mbak0aw0zrprcido
        parent: mbp at sourcefrog.net-20081209005125-t9gmzphq8np6bvti
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: 277048-transport-registry
        timestamp: Mon 2008-12-08 17:49:56 -0800
        message:
          Add Registry.items()
        modified:
          bzrlib/registry.py             lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
        ------------------------------------------------------------
        revno: 3879.4.1
        revision-id: mbp at sourcefrog.net-20081209005125-t9gmzphq8np6bvti
        parent: pqm at pqm.ubuntu.com-20081205181554-ofrdnafloc43bxkh
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: 277048-transport-registry
        timestamp: Mon 2008-12-08 16:51:25 -0800
        message:
          Don't call iteritems on transport_list_registry, because it may change during iteration
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
    ------------------------------------------------------------
    revno: 3879.2.3
    revision-id: pqm at pqm.ubuntu.com-20081205181554-ofrdnafloc43bxkh
    parent: pqm at pqm.ubuntu.com-20081205172136-vccv8ynqac6sxr5s
    parent: john at arbash-meinel.com-20081205172640-b8rodpb4rd984il3
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-12-05 18:15:54 +0000
    message:
      (jam) Merge the summary message for bzr-1.10
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3879.3.1
        revision-id: john at arbash-meinel.com-20081205172640-b8rodpb4rd984il3
        parent: pqm at pqm.ubuntu.com-20081205172136-vccv8ynqac6sxr5s
        parent: pqm at pqm.ubuntu.com-20081205164845-3ctd11mapsnsm5dt
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: jam-integration
        timestamp: Fri 2008-12-05 11:26:40 -0600
        message:
          Merge the summary message for bzr-1.10
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3871.1.5
        revision-id: pqm at pqm.ubuntu.com-20081205164845-3ctd11mapsnsm5dt
        parent: pqm at pqm.ubuntu.com-20081205152639-fk4ic12v7srk5rn3
        parent: john at arbash-meinel.com-20081205154428-7jpa0bey1cczlbj0
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: 1.10
        timestamp: Fri 2008-12-05 16:48:45 +0000
        message:
          (jam) Add the summary message to NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3871.6.1
        revision-id: john at arbash-meinel.com-20081205154428-7jpa0bey1cczlbj0
        parent: pqm at pqm.ubuntu.com-20081205152639-fk4ic12v7srk5rn3
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: 1.10-final
        timestamp: Fri 2008-12-05 09:44:28 -0600
        message:
          Add the summary message to NEWS.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3879.2.2
    revision-id: pqm at pqm.ubuntu.com-20081205172136-vccv8ynqac6sxr5s
    parent: pqm at pqm.ubuntu.com-20081205161407-zulgn2hssd85nsdk
    parent: jelmer at samba.org-20081205024239-n9o1ezqlz6bmdc36
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-12-05 17:21:36 +0000
    message:
      (Jelmer) Add BzrDir.backup_bzrdir().
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
      bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
        ------------------------------------------------------------
        revno: 3872.3.3
        revision-id: jelmer at samba.org-20081205024239-n9o1ezqlz6bmdc36
        parent: jelmer at samba.org-20081205014155-y7sf11idc86fpsrw
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: backup-bzrdir
        timestamp: Fri 2008-12-05 03:42:39 +0100
        message:
          Add test for backup_bzrdir.
        modified:
          bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
        ------------------------------------------------------------
        revno: 3872.3.2
        revision-id: jelmer at samba.org-20081205014155-y7sf11idc86fpsrw
        parent: jelmer at samba.org-20081129151331-99uadxvmyt3ku0ly
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: backup-bzrdir
        timestamp: Fri 2008-12-05 02:41:55 +0100
        message:
          make backup_bzrdir determine the name for the backup files.
        modified:
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
        ------------------------------------------------------------
        revno: 3872.3.1
        revision-id: jelmer at samba.org-20081129151331-99uadxvmyt3ku0ly
        parent: pqm at pqm.ubuntu.com-20081128071639-usprv2emoq2mgxnw
        committer: Jelmer Vernooij <jelmer at samba.org>
        branch nick: bzr.dev
        timestamp: Sat 2008-11-29 16:13:31 +0100
        message:
          Allow BzrDir implementation to implement backing up of control directory.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/upgrade.py              history2weaves.py-20050818063535-e7d319791c19a8b2
    ------------------------------------------------------------
    revno: 3879.2.1
    revision-id: pqm at pqm.ubuntu.com-20081205161407-zulgn2hssd85nsdk
    parent: pqm at pqm.ubuntu.com-20081205135154-uwqcpl3lruah9fo3
    parent: john at arbash-meinel.com-20081205153402-gdijhzyed62jfnqh
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: +trunk
    timestamp: Fri 2008-12-05 16:14:07 +0000
    message:
      (jam) Merge bzr 1.10-final back into bzr.dev
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
      bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
      bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
    ------------------------------------------------------------
    revno: 3879.1.1
    revision-id: john at arbash-meinel.com-20081205153402-gdijhzyed62jfnqh
    parent: pqm at pqm.ubuntu.com-20081205135154-uwqcpl3lruah9fo3
    parent: pqm at pqm.ubuntu.com-20081205152639-fk4ic12v7srk5rn3
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: jam-integration
    timestamp: Fri 2008-12-05 09:34:02 -0600
    message:
      Merge 1.10-final back into bzr.dev (cleanup trailing whitespace in NEWS)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
      bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
      bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
    ------------------------------------------------------------
    revno: 3871.1.4
    revision-id: pqm at pqm.ubuntu.com-20081205152639-fk4ic12v7srk5rn3
    parent: pqm at pqm.ubuntu.com-20081205145233-6qgdek3o9rc707h0
    parent: john at arbash-meinel.com-20081205143309-takal6vjg6vpj7rr
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: 1.10
    timestamp: Fri 2008-12-05 15:26:39 +0000
    message:
      (jam) Release bzr 1.10-final
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
        ------------------------------------------------------------
        revno: 3871.5.1
        revision-id: john at arbash-meinel.com-20081205143309-takal6vjg6vpj7rr
        parent: pqm at pqm.ubuntu.com-20081202062535-khqslu9vyrvzr7om
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: 1.10-final
        timestamp: Fri 2008-12-05 08:33:09 -0600
        message:
          Release bzr-1.10 final
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 3871.1.3
    revision-id: pqm at pqm.ubuntu.com-20081205145233-6qgdek3o9rc707h0
    parent: pqm at pqm.ubuntu.com-20081202062535-khqslu9vyrvzr7om
    parent: john at arbash-meinel.com-20081205141246-oh4q75ql22754ncc
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: 1.10
    timestamp: Fri 2008-12-05 14:52:33 +0000
    message:
      (jam) Fix bug #304841,
      	sort requests topologically and properly only check compression
      	parent.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
      bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
      bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
      bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
        ------------------------------------------------------------
        revno: 3871.4.6
        revision-id: john at arbash-meinel.com-20081205141246-oh4q75ql22754ncc
        parent: john at arbash-meinel.com-20081203222940-7kh36q4ewhrwbwl7
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: 304841-not-present-chain
        timestamp: Fri 2008-12-05 08:12:46 -0600
        message:
          Remove the import pdb; statement.
        modified:
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
        ------------------------------------------------------------
        revno: 3871.4.5
        revision-id: john at arbash-meinel.com-20081203222940-7kh36q4ewhrwbwl7
        parent: john at arbash-meinel.com-20081203222758-s30tazlndlw7env0
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: 304841-not-present-chain
        timestamp: Wed 2008-12-03 16:29:40 -0600
        message:
          NEWS about fixing bug #304841
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3871.4.4
        revision-id: john at arbash-meinel.com-20081203222758-s30tazlndlw7env0
        parent: john at arbash-meinel.com-20081203222454-f91otv07o8zgo2nv
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: 304841-not-present-chain
        timestamp: Wed 2008-12-03 16:27:58 -0600
        message:
          Another fix for bug #304841. As a broad-spectrum solution,
           always request in topological order.
        modified:
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/per_repository/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
        ------------------------------------------------------------
        revno: 3871.4.3
        revision-id: john at arbash-meinel.com-20081203222454-f91otv07o8zgo2nv
        parent: john at arbash-meinel.com-20081203222224-j2j5eef3jb38nloc
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: 304841-not-present-chain
        timestamp: Wed 2008-12-03 16:24:54 -0600
        message:
          We should only care if the compression parent is not available, not if all parents are available.
        modified:
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
        ------------------------------------------------------------
        revno: 3871.4.2
        revision-id: john at arbash-meinel.com-20081203222224-j2j5eef3jb38nloc
        parent: john at arbash-meinel.com-20081203210501-fejpuwpvfkvwogxd
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: 304841-not-present-chain
        timestamp: Wed 2008-12-03 16:22:24 -0600
        message:
          Finally a test case that reproduces bug #304841
        modified:
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
        ------------------------------------------------------------
        revno: 3871.4.1
        revision-id: john at arbash-meinel.com-20081203210501-fejpuwpvfkvwogxd
        parent: pqm at pqm.ubuntu.com-20081202062535-khqslu9vyrvzr7om
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: 304841-not-present-chain
        timestamp: Wed 2008-12-03 15:05:01 -0600
        message:
          Add a VFDecorator that can yield records in a specified order
        modified:
          bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
          bzrlib/versionedfile.py        versionedfile.py-20060222045106-5039c71ee3b65490
    ------------------------------------------------------------
    revno: 3871.1.2
    revision-id: pqm at pqm.ubuntu.com-20081202062535-khqslu9vyrvzr7om
    parent: mbp at sourcefrog.net-20081128054531-b4pwjwcmcnj7qjod
    parent: mbp at sourcefrog.net-20081202051251-jkvz010v9e79lepm
    committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
    branch nick: 1.10
    timestamp: Tue 2008-12-02 06:25:35 +0000
    message:
      (mbp, #303856) Don't set a pack write cache from RepoFetcher
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
      bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
    ------------------------------------------------------------
    revno: 3871.3.2
    revision-id: mbp at sourcefrog.net-20081202051251-jkvz010v9e79lepm
    parent: mbp at sourcefrog.net-20081202051107-h5s9na914q3anhkg
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: 303856-write-caching
    timestamp: Tue 2008-12-02 16:12:51 +1100
    message:
      Update news and bump version to 1.10rc2
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
    ------------------------------------------------------------
    revno: 3871.3.1
    revision-id: mbp at sourcefrog.net-20081202051107-h5s9na914q3anhkg
    parent: mbp at sourcefrog.net-20081128054531-b4pwjwcmcnj7qjod
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: 303856-write-caching
    timestamp: Tue 2008-12-02 16:11:07 +1100
    message:
      Don't set a pack write cache size from RepoFetcher, because the cache is not coherent with reads and causes ShortReadvErrors
    modified:
      bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
-------------- next part --------------

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


More information about the bazaar-commits mailing list