Rev 3038: merge Robert's reconcile work. in http://bzr.arbash-meinel.com/branches/bzr/0.93-dev/fetch_check_parents_165290

John Arbash Meinel john at arbash-meinel.com
Fri Nov 30 05:09:02 GMT 2007


At http://bzr.arbash-meinel.com/branches/bzr/0.93-dev/fetch_check_parents_165290

------------------------------------------------------------
revno: 3038
revision-id:john at arbash-meinel.com-20071130050802-aqswmc0a7sv7hal9
parent: john at arbash-meinel.com-20071129224130-m720z00xtmovmj06
parent: robertc at robertcollins.net-20071129052352-pmhtuajnb1i7mpy4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: fetch_check_parents_165290
timestamp: Thu 2007-11-29 23:08:02 -0600
message:
  merge Robert's reconcile work.
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  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/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
  bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
  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/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
  bzrlib/tests/repository_implementations/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
  bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
  bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
  bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
  doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
  doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
  doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
  doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
    ------------------------------------------------------------
    revno: 2951.1.10.1.10
    revision-id:robertc at robertcollins.net-20071129052352-pmhtuajnb1i7mpy4
    parent: robertc at robertcollins.net-20071129041406-4zzhzzpihmspiu9k
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile.packs
    timestamp: Thu 2007-11-29 16:23:52 +1100
    message:
      Fix syntax error on last refactoring.
    modified:
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
    ------------------------------------------------------------
    revno: 2951.1.10.1.9
    revision-id:robertc at robertcollins.net-20071129041406-4zzhzzpihmspiu9k
    parent: robertc at robertcollins.net-20071129014512-qwfvultxzo9w6ot4
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile.packs
    timestamp: Thu 2007-11-29 15:14:06 +1100
    message:
      * ``pack-0.92`` repositories can now be reconciled.
        (Robert Collins, #154173)
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
    ------------------------------------------------------------
    revno: 2951.1.10.1.8
    revision-id:robertc at robertcollins.net-20071129014512-qwfvultxzo9w6ot4
    parent: robertc at robertcollins.net-20071128233626-7prd9kkgj1l0kmk1
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile.packs
    timestamp: Thu 2007-11-29 12:45:12 +1100
    message:
      Test that reconciling a repository can be done twice in a row.
    modified:
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
    ------------------------------------------------------------
    revno: 2951.1.10.1.7
    revision-id:robertc at robertcollins.net-20071128233626-7prd9kkgj1l0kmk1
    parent: robertc at robertcollins.net-20071128233229-n0blldup87wo4vhq
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile.packs
    timestamp: Thu 2007-11-29 10:36:26 +1100
    message:
      Raise an error on duplicate pack name allocation.
    modified:
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
    ------------------------------------------------------------
    revno: 2951.1.10.1.6
    revision-id:robertc at robertcollins.net-20071128233229-n0blldup87wo4vhq
    parent: robertc at robertcollins.net-20071114003450-4dm5g7tytjdjo9su
    parent: pqm at pqm.ubuntu.com-20071128230840-b2ra2nso0qtqxon6
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile.packs
    timestamp: Thu 2007-11-29 10:32:29 +1100
    message:
      Merge bzr.dev.
    added:
      bzrlib/lru_cache.py            lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
      bzrlib/switch.py               switch.py-20071116011000-v5lnw7d2wkng9eux-1
      bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
      bzrlib/tests/repository_implementations/test__generate_text_key_index.py test__generate_text_-20071114232121-00h9fd8qg8kjfa5k-1
      bzrlib/tests/repository_implementations/test_find_text_key_references.py test_find_text_key_r-20071114033605-v73bakal8x77qlfi-1
      bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
      bzrlib/tests/test_switch.py    test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
    renamed:
      doc/developers/knitpack.txt => doc/developers/packrepo.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
      bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
      bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
      bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
      bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
      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/index.py                index.py-20070712131115-lolkarso50vjr64s-1
      bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
      bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
      bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
      bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
      bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
      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/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
      bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
      bzrlib/sign_my_commits.py      sign_my_commits.py-20060215152201-5a6363365180e671
      bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
      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/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
      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_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
      bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
      bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
      bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
      bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
      bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
      bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
      bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.py test_get_revision_id-20070417211641-6kcoj1c704gqqopn-1
      bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
      bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
      bzrlib/tests/commands/test_checkout.py test_checkout.py-20070525151718-vm7ligd5px5dtmda-1
      bzrlib/tests/ftp_server.py     ftpserver.py-20071019102346-61jbvdkrr70igauv-1
      bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
      bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
      bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
      bzrlib/tests/repository_implementations/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
      bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
      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_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
      bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
      bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
      bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
      bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
      bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
      bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
      bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
      bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
      bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
      bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
      bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
      bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
      bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
      bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
      bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
      bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
      bzrlib/tests/test_revert.py    test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
      bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
      bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
      bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
      bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
      bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
      bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
      bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
      bzrlib/tests/workingtree_implementations/test_break_lock.py test_break_lock.py-20060504115740-233e245df546fd42
      bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
      bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
      bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
      bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
      bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
      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/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
      bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
      bzrlib/util/configobj/docs/BSD-LICENSE.txt BSDLICENSE.txt-20051018184548-29b89ff3102657f5
      bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
      bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
      bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
      bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
      doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
      doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
      doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
      doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
      doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
      doc/en/user-reference/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
      doc/developers/packrepo.txt    knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
        ------------------------------------------------------------
        revno: 3035.1.9
        revision-id:pqm at pqm.ubuntu.com-20071128230840-b2ra2nso0qtqxon6
        parent: pqm at pqm.ubuntu.com-20071128171926-dafi3r2iq6e4vle1
        parent: bialix at ukr.net-20071128210408-bfc2z901pk1e6fje
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Wed 2007-11-28 23:08:40 +0000
        message:
          TreeTransform handles case-insensitive filesystems well
        modified:
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
          bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
          bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
            ------------------------------------------------------------
            revno: 3034.4.9
            revision-id:bialix at ukr.net-20071128210408-bfc2z901pk1e6fje
            parent: bialix at ukr.net-20071128205924-ozm9qxt0texyc4ln
            committer: Alexander Belchenko <bialix at ukr.net>
            branch nick: aaron
            timestamp: Wed 2007-11-28 23:04:08 +0200
            message:
              skip test_workingtree.TestWorkingTree.test_case_sensitive for WT2
            modified:
              bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
            ------------------------------------------------------------
            revno: 3034.4.8
            revision-id:bialix at ukr.net-20071128205924-ozm9qxt0texyc4ln
            parent: abentley at panoramicfeedback.com-20071128145615-6ckqqiymro15jbb1
            committer: Alexander Belchenko <bialix at ukr.net>
            branch nick: aaron
            timestamp: Wed 2007-11-28 22:59:24 +0200
            message:
              TestCaseInTempDir.build_tree now checks type of shape argument.
            modified:
              bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
            ------------------------------------------------------------
            revno: 3034.4.7
            revision-id:abentley at panoramicfeedback.com-20071128145615-6ckqqiymro15jbb1
            parent: abentley at panoramicfeedback.com-20071128142240-kkw4ft7p545p0a0k
            committer: Aaron Bentley <abentley at panoramicfeedback.com>
            branch nick: transform-case
            timestamp: Wed 2007-11-28 09:56:15 -0500
            message:
              Add test for filename conflicts with existing files
            modified:
              bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
            ------------------------------------------------------------
            revno: 3034.4.6
            revision-id:abentley at panoramicfeedback.com-20071128142240-kkw4ft7p545p0a0k
            parent: abentley at panoramicfeedback.com-20071128141636-bbm7lusqat2ek2ao
            committer: Aaron Bentley <abentley at panoramicfeedback.com>
            branch nick: transform-case
            timestamp: Wed 2007-11-28 09:22:40 -0500
            message:
              Update apply_case_conflict tests
            modified:
              bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
            ------------------------------------------------------------
            revno: 3034.4.5
            revision-id:abentley at panoramicfeedback.com-20071128141636-bbm7lusqat2ek2ao
            parent: aaron.bentley at utoronto.ca-20071128022527-juav8ud1712wphwz
            committer: Aaron Bentley <abentley at panoramicfeedback.com>
            branch nick: transform-case
            timestamp: Wed 2007-11-28 09:16:36 -0500
            message:
              Add workingtree test for case_insensitive var
            modified:
              bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
            ------------------------------------------------------------
            revno: 3034.4.4
            revision-id:aaron.bentley at utoronto.ca-20071128022527-juav8ud1712wphwz
            parent: aaron.bentley at utoronto.ca-20071128012128-gz9ep3oyvh1xt38n
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: transform-case
            timestamp: Tue 2007-11-27 21:25:27 -0500
            message:
              Fix case-sensitivity detection
            modified:
              bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
            ------------------------------------------------------------
            revno: 3034.4.3
            revision-id:aaron.bentley at utoronto.ca-20071128012128-gz9ep3oyvh1xt38n
            parent: aaron.bentley at utoronto.ca-20071128000531-mq2lgadv5c9471nf
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: transform-case
            timestamp: Tue 2007-11-27 20:21:28 -0500
            message:
              Add case-sensitivity handling to WorkingTree
            modified:
              bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
              bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
              bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
            ------------------------------------------------------------
            revno: 3034.4.2
            revision-id:aaron.bentley at utoronto.ca-20071128000531-mq2lgadv5c9471nf
            parent: aaron.bentley at utoronto.ca-20071127132444-zq5nq2cs13ljnm6z
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: transform-case
            timestamp: Tue 2007-11-27 19:05:31 -0500
            message:
              Get conflict handling and case-insensitive tree creation under test
            modified:
              bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
            ------------------------------------------------------------
            revno: 3034.4.1
            revision-id:aaron.bentley at utoronto.ca-20071127132444-zq5nq2cs13ljnm6z
            parent: pqm at pqm.ubuntu.com-20071127023739-a1ajr28wi7so2up6
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: transform-case
            timestamp: Tue 2007-11-27 08:24:44 -0500
            message:
              Start handling case-insensitivity
            modified:
              bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
              bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
              bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
              bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3035.1.8
        revision-id:pqm at pqm.ubuntu.com-20071128171926-dafi3r2iq6e4vle1
        parent: pqm at pqm.ubuntu.com-20071128053506-it05wgucjiw2chfq
        parent: mnordhoff at mattnordhoff.com-20071128094514-kimiwjwblhy1d14q
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Wed 2007-11-28 17:19:26 +0000
        message:
          Fix link in rich-root-pack help (Nordhoff)
        modified:
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
            ------------------------------------------------------------
            revno: 3035.1.5.1.1
            revision-id:mnordhoff at mattnordhoff.com-20071128094514-kimiwjwblhy1d14q
            parent: pqm at pqm.ubuntu.com-20071128013549-w54seazrf4oeywb9
            committer: Matt Nordhoff <mnordhoff at mattnordhoff.com>
            branch nick: rich-root-pack-link
            timestamp: Wed 2007-11-28 04:45:14 -0500
            message:
              (trivial) rich-root-pack help still linked to knitpack.html when it's been renamed.
            modified:
              bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
        ------------------------------------------------------------
        revno: 3035.1.7
        revision-id:pqm at pqm.ubuntu.com-20071128053506-it05wgucjiw2chfq
        parent: pqm at pqm.ubuntu.com-20071128045852-9ii8fj85vxz1om46
        parent: mbp at sourcefrog.net-20071127074755-4nsgzhsaqxr9nwv8
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Wed 2007-11-28 05:35:06 +0000
        message:
          Post-review cleanups from Robert for KnitVersionedFile.get_data_stream
        modified:
          bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
            ------------------------------------------------------------
            revno: 3034.3.1
            revision-id:mbp at sourcefrog.net-20071127074755-4nsgzhsaqxr9nwv8
            parent: pqm at pqm.ubuntu.com-20071127023739-a1ajr28wi7so2up6
            committer: Martin Pool <mbp at sourcefrog.net>
            branch nick: 164637-delta-order
            timestamp: Tue 2007-11-27 18:47:55 +1100
            message:
              Post-review cleanups from Robert for KnitVersionedFile.get_data_stream
            modified:
              bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
        ------------------------------------------------------------
        revno: 3035.1.6
        revision-id:pqm at pqm.ubuntu.com-20071128045852-9ii8fj85vxz1om46
        parent: pqm at pqm.ubuntu.com-20071128013549-w54seazrf4oeywb9
        parent: aaron.bentley at utoronto.ca-20071128020615-s9j44kvvnbvu1xju
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Wed 2007-11-28 04:58:52 +0000
        message:
          Fix is_executable tests for win32
        modified:
          bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
            ------------------------------------------------------------
            revno: 3034.2.1
            revision-id:aaron.bentley at utoronto.ca-20071128020615-s9j44kvvnbvu1xju
            parent: pqm at pqm.ubuntu.com-20071127023739-a1ajr28wi7so2up6
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: win32fixes
            timestamp: Tue 2007-11-27 21:06:15 -0500
            message:
              Fix is_executable tests for win32
            modified:
              bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
        ------------------------------------------------------------
        revno: 3035.1.5
        revision-id:pqm at pqm.ubuntu.com-20071128013549-w54seazrf4oeywb9
        parent: pqm at pqm.ubuntu.com-20071128005930-4wb5pl12fyq8ek13
        parent: robertc at robertcollins.net-20071128003519-a5hpblnvtdnuvqb8
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Wed 2007-11-28 01:35:49 +0000
        message:
          (robertc) Fix check to correctly report unreferenced texts. (Robert
          	Collins, John A Meinel, 162931, 165071)
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
          bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
          bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
          bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/repository_implementations/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
            ------------------------------------------------------------
            revno: 3035.1.1.1.4
            revision-id:robertc at robertcollins.net-20071128003519-a5hpblnvtdnuvqb8
            parent: robertc at robertcollins.net-20071127233922-1492vwylotgzjw9p
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: check
            timestamp: Wed 2007-11-28 11:35:19 +1100
            message:
              Fix failing test due to correct check code.
            modified:
              bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
            ------------------------------------------------------------
            revno: 3035.1.1.1.3
            revision-id:robertc at robertcollins.net-20071127233922-1492vwylotgzjw9p
            parent: robertc at robertcollins.net-20071127220431-tdbtagcse2nigx8k
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: check
            timestamp: Wed 2007-11-28 10:39:22 +1100
            message:
              Privatise VersionedFileChecker.
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
              bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
              bzrlib/remote.py               remote.py-20060720103555-yeeg2x51vn0rbtdp-1
              bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
            ------------------------------------------------------------
            revno: 3035.1.1.1.2
            revision-id:robertc at robertcollins.net-20071127220431-tdbtagcse2nigx8k
            parent: robertc at robertcollins.net-20071127215836-300j320ru8mbyl85
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: check
            timestamp: Wed 2007-11-28 09:04:31 +1100
            message:
              Simplify the check_file_version_parents API some more. This has already changed in this release cycle.
            modified:
              bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
              bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
              bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
            ------------------------------------------------------------
            revno: 3035.1.1.1.1
            revision-id:robertc at robertcollins.net-20071127215836-300j320ru8mbyl85
            parent: pqm at pqm.ubuntu.com-20071127143838-lkx79x6q91uptc1o
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: check
            timestamp: Wed 2007-11-28 08:58:36 +1100
            message:
              * ``check`` no longer reports spurious unreferenced text versions.
                (Robert Collins, John A Meinel, #162931, #165071)
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
              bzrlib/tests/repository_implementations/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
        ------------------------------------------------------------
        revno: 3035.1.4
        revision-id:pqm at pqm.ubuntu.com-20071128005930-4wb5pl12fyq8ek13
        parent: pqm at pqm.ubuntu.com-20071127221818-jsklce3rngimazga
        parent: robertc at robertcollins.net-20071127225128-s5dr0ry09hj78kdl
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Wed 2007-11-28 00:59:30 +0000
        message:
          (robertc) Change commit on pack repositories to use the per-file
          	graph for heads() calculations. (Robert Collins, 165306)
        modified:
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
          bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
          bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
            ------------------------------------------------------------
            revno: 2979.2.5
            revision-id:robertc at robertcollins.net-20071127225128-s5dr0ry09hj78kdl
            parent: robertc at robertcollins.net-20071127222643-86fymmfpn6xw88up
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: commit.merge-speed
            timestamp: Wed 2007-11-28 09:51:28 +1100
            message:
              Make CommitBuilder.heads be _heads as its internal to CommitBuilder only.
            modified:
              bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
              bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
            ------------------------------------------------------------
            revno: 2979.2.4
            revision-id:robertc at robertcollins.net-20071127222643-86fymmfpn6xw88up
            parent: robertc at robertcollins.net-20071114181956-osz2q0sa6v2wpb1b
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: commit.merge-speed
            timestamp: Wed 2007-11-28 09:26:43 +1100
            message:
              Docstring fixes from review.
            modified:
              bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
            ------------------------------------------------------------
            revno: 2979.2.3
            revision-id:robertc at robertcollins.net-20071114181956-osz2q0sa6v2wpb1b
            parent: robertc at robertcollins.net-20071112225758-co7hf9fpdonhkzs8
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: commit.merge-speed
            timestamp: Thu 2007-11-15 05:19:56 +1100
            message:
              Tweaks from John.
            modified:
              bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
            ------------------------------------------------------------
            revno: 2979.2.2
            revision-id:robertc at robertcollins.net-20071112225758-co7hf9fpdonhkzs8
            parent: robertc at robertcollins.net-20071112210301-da1gpusi4p68xhxj
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: commit.merge-speed
            timestamp: Tue 2007-11-13 09:57:58 +1100
            message:
              Per-file graph heads detection during commit for pack repositories.
            modified:
              bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
              bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
              bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
              bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
            ------------------------------------------------------------
            revno: 2979.2.1
            revision-id:robertc at robertcollins.net-20071112210301-da1gpusi4p68xhxj
            parent: pqm at pqm.ubuntu.com-20071112195430-0xgqswqpc1j2pk2m
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: commit.merge-speed
            timestamp: Tue 2007-11-13 08:03:01 +1100
            message:
              Make it possible for different commit builders to override heads().
            modified:
              bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
        ------------------------------------------------------------
        revno: 3035.1.3
        revision-id:pqm at pqm.ubuntu.com-20071127221818-jsklce3rngimazga
        parent: pqm at pqm.ubuntu.com-20071127203256-inr45zjrbheqn618
        parent: robertc at robertcollins.net-20071127203502-280mxe1zvdlagrpe
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Tue 2007-11-27 22:18:18 +0000
        message:
          Merge with bzr.dev.
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.20
            revision-id:robertc at robertcollins.net-20071127203502-280mxe1zvdlagrpe
            parent: robertc at robertcollins.net-20071118195639-m6zf3d5ljjw88kkn
            parent: pqm at pqm.ubuntu.com-20071127143838-lkx79x6q91uptc1o
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Wed 2007-11-28 07:35:02 +1100
            message:
              Merge with bzr.dev.
            added:
              bzrlib/switch.py               switch.py-20071116011000-v5lnw7d2wkng9eux-1
              bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
              bzrlib/tests/repository_implementations/test__generate_text_key_index.py test__generate_text_-20071114232121-00h9fd8qg8kjfa5k-1
              bzrlib/tests/repository_implementations/test_find_text_key_references.py test_find_text_key_r-20071114033605-v73bakal8x77qlfi-1
              bzrlib/tests/test_switch.py    test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
            renamed:
              doc/developers/knitpack.txt => doc/developers/packrepo.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
              bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
              bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
              bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
              bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
              bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
              bzrlib/conflicts.py            conflicts.py-20051001061850-78ef952ba63d2b42
              bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
              bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
              bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
              bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
              bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
              bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
              bzrlib/lru_cache.py            lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
              bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
              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/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
              bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
              bzrlib/revision.py             revision.py-20050309040759-e77802c08f3999d5
              bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
              bzrlib/sign_my_commits.py      sign_my_commits.py-20060215152201-5a6363365180e671
              bzrlib/smart/branch.py         branch.py-20061124031907-mzh3pla28r83r97f-1
              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/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
              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_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
              bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
              bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
              bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
              bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
              bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
              bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
              bzrlib/tests/ftp_server.py     ftpserver.py-20071019102346-61jbvdkrr70igauv-1
              bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
              bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
              bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
              bzrlib/tests/repository_implementations/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
              bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
              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_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
              bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
              bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
              bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
              bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
              bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
              bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
              bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
              bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
              bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
              bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
              bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
              bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
              bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
              bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
              bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
              bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
              bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
              bzrlib/tests/test_revert.py    test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
              bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
              bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
              bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
              bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
              bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
              bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
              bzrlib/tests/workingtree_implementations/test_break_lock.py test_break_lock.py-20060504115740-233e245df546fd42
              bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
              bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
              bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
              bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
              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/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
              bzrlib/util/configobj/docs/BSD-LICENSE.txt BSDLICENSE.txt-20051018184548-29b89ff3102657f5
              bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
              bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
              bzrlib/win32utils.py           win32console.py-20051021033308-123c6c929d04973d
              bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
              bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
              doc/en/user-reference/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
              doc/developers/packrepo.txt    knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.19
            revision-id:robertc at robertcollins.net-20071118195639-m6zf3d5ljjw88kkn
            parent: robertc at robertcollins.net-20071112235223-vmqe28yqjiaz0nni
            parent: pqm at pqm.ubuntu.com-20071117180742-59zhz30s7839y41j
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Mon 2007-11-19 06:56:39 +1100
            message:
              Merge bzr.dev.
            added:
              bzrlib/lru_cache.py            lru_cache.py-20070119165515-tlw203kuwh0id5gv-1
              bzrlib/tests/test_lru_cache.py test_lru_cache.py-20070119165535-hph6rk4h9rzy4180-1
              bzrlib/tests/tree_implementations/test_get_root_id.py test_get_root_id.py-20071026191509-a4conhr43f194avv-1
              doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
              bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
              bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
              bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
              bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
              bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
              bzrlib/index.py                index.py-20070712131115-lolkarso50vjr64s-1
              bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
              bzrlib/log.py                  log.py-20050505065812-c40ce11702fe5fb1
              bzrlib/memorytree.py           memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
              bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
              bzrlib/pack.py                 container.py-20070607160755-tr8zc26q18rn0jnb-1
              bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
              bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
              bzrlib/plugins/launchpad/lp_indirect.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
              bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
              bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
              bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
              bzrlib/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/smart/__init__.py       __init__.py-20061101100249-8jwwl0d3jr080zim-1
              bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
              bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
              bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
              bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
              bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
              bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
              bzrlib/tests/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
              bzrlib/tests/branch_implementations/test_get_revision_id_to_revno_map.py test_get_revision_id-20070417211641-6kcoj1c704gqqopn-1
              bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
              bzrlib/tests/commands/test_checkout.py test_checkout.py-20070525151718-vm7ligd5px5dtmda-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_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
              bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
              bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
              bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
              bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
              bzrlib/tests/test_log.py       testlog.py-20050728115707-1a514809d7d49309
              bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
              bzrlib/tests/test_pack.py      test_container.py-20070607160755-tr8zc26q18rn0jnb-2
              bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
              bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
              bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
              bzrlib/tests/test_ssh_transport.py test_ssh_transport.p-20070105153201-f7iq2bosvgjbdgc3-1
              bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
              bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
              bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
              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_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
              bzrlib/tests/workingtree_implementations/test_unversion.py test_unversion.py-20060907074408-bygh2y28jz8u0cg7-1
              bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
              bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
              bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
              bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
              bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
              bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
              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/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
              doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.18
            revision-id:robertc at robertcollins.net-20071112235223-vmqe28yqjiaz0nni
            parent: robertc at robertcollins.net-20071105215402-3ofxsa1aqj8ro0bo
            parent: pqm at pqm.ubuntu.com-20071112195430-0xgqswqpc1j2pk2m
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Tue 2007-11-13 10:52:23 +1100
            message:
              Merge bzr.dev.
            modified:
              Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzr                            bzr.py-20050313053754-5485f144c7006fa6
              bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
              bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
              bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
              bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
              bzrlib/lazy_import.py          lazy_import.py-20060910203832-f77c54gf3n232za0-1
              bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
              bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
              bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
              bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
              bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
              bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
              bzrlib/tests/branch_implementations/test_create_checkout.py test_create_checkout-20070322193723-n2wkp1g03r0404di-1
              bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
              bzrlib/tests/ftp_server.py     ftpserver.py-20071019102346-61jbvdkrr70igauv-1
              bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
              bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
              bzrlib/tests/workingtree_implementations/test_walkdirs.py test_walkdirs.py-20060731045042-ch366w6dve2m7ro9-1
              bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
              doc/developers/knitpack.txt    knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
              tools/win32/bzr-win32-bdist-postinstall.py bzrwin32bdistpostinstall.py-20060629085133-098bsfj3va8jc0ql-1
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.17
            revision-id:robertc at robertcollins.net-20071105215402-3ofxsa1aqj8ro0bo
            parent: robertc at robertcollins.net-20071102002057-ox02yp5uish1a1xe
            parent: pqm at pqm.ubuntu.com-20071105211156-bwx6vf8f88m247cy
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Tue 2007-11-06 08:54:02 +1100
            message:
              Merge bzr.dev.
            added:
              doc/en/user-guide/authentication_conf.txt authentication_conf.-20071104135035-glfv0ri355tyg1nf-1
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
              bzrlib/config.py               config.py-20051011043216-070c74f4e9e338e8
              bzrlib/debug.py                debug.py-20061102062349-vdhrw9qdpck8cl35-1
              bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
              bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
              bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
              bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
              bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
              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/smtp_connection.py      smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
              bzrlib/tests/HTTPTestUtil.py   HTTPTestUtil.py-20050914180604-247d3aafb7a43343
              bzrlib/tests/HttpServer.py     httpserver.py-20061012142527-m1yxdj1xazsf8d7s-1
              bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
              bzrlib/tests/blackbox/test_check.py test_check.py-20071024054728-mn44rt3z5hnqcbke-1
              bzrlib/tests/blackbox/test_debug.py test_debug.py-20061026142942-q76cgg41785b3mdk-1
              bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
              bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
              bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
              bzrlib/tests/blackbox/test_whoami.py test_whoami.py-20060629025641-8h3m2ch7kutqx7ug-1
              bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
              bzrlib/tests/branch_implementations/test_break_lock.py test_break_lock.py-20060504111902-9aae411dbe9aadd2
              bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
              bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
              bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
              bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
              bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
              bzrlib/tests/repository_implementations/helpers.py helpers.py-20070924032407-m460yl9j5gu5ju85-2
              bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
              bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
              bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
              bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
              bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
              bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
              bzrlib/tests/test_config.py    testconfig.py-20051011041908-742d0c15d8d8c8eb
              bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
              bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
              bzrlib/tests/test_hashcache.py testhashcache.py-20050706091800-0288ab2659338981
              bzrlib/tests/test_http.py      testhttp.py-20051018020158-b2eef6e867c514d9
              bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
              bzrlib/tests/test_osutils_encodings.py test_osutils_encodin-20061226013130-kkp732tpt3lm91vv-1
              bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
              bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
              bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
              bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
              bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
              bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
              bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
              bzrlib/tests/tree_implementations/test_get_symlink_target.py test_get_symlink_tar-20070225165554-ickod3w3t7u0zzqh-1
              bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
              bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
              bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
              bzrlib/tests/workingtree_implementations/test_pull.py test_pull.py-20060222044334-43594dd8e143b708
              bzrlib/tests/workingtree_implementations/test_walkdirs.py test_walkdirs.py-20060731045042-ch366w6dve2m7ro9-1
              bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
              bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
              bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
              bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
              bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
              bzrlib/transport/memory.py     memory.py-20051016101338-cd008dbdf69f04fc
              bzrlib/transport/ssh.py        ssh.py-20060824042150-0s9787kng6zv1nwq-1
              bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
              doc/developers/authentication-ring.txt authring.txt-20070718200437-q5tdik0ne6lor86d-1
              doc/en/user-guide/configuration.txt configuration.txt-20060314161707-868350809502af01
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.16
            revision-id:robertc at robertcollins.net-20071102002057-ox02yp5uish1a1xe
            parent: robertc at robertcollins.net-20071030204117-odbfrt5u28k8ur4l
            parent: pqm at pqm.ubuntu.com-20071031141102-b5664t8izotfnc6h
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Fri 2007-11-02 11:20:57 +1100
            message:
              Merge bzr.dev.
            added:
              bzrlib/tests/ftp_server.py     ftpserver.py-20071019102346-61jbvdkrr70igauv-1
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
              bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
              bzrlib/tests/test_ftp_transport.py test_aftp_transport.-20060823221619-98mwjzxtwtkt527k-1
              bzrlib/transport/ftp.py        ftp.py-20051116161804-58dc9506548c2a53
              bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
              bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
              bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.15
            revision-id:robertc at robertcollins.net-20071030204117-odbfrt5u28k8ur4l
            parent: robertc at robertcollins.net-20071030204056-i1pugmzelp3uu0by
            parent: robertc at robertcollins.net-20071030200323-2iyytqgqcltpngta
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Wed 2007-10-31 07:41:17 +1100
            message:
              Fast revert too.
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.14
            revision-id:robertc at robertcollins.net-20071030204056-i1pugmzelp3uu0by
            parent: robertc at robertcollins.net-20071030180532-9deflvcm5z1m93yq
            parent: pqm at pqm.ubuntu.com-20071030203434-6ffpvdncd12ncx3d
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Wed 2007-10-31 07:40:56 +1100
            message:
              Merge bzr.dev.
            modified:
              bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.13
            revision-id:robertc at robertcollins.net-20071030180532-9deflvcm5z1m93yq
            parent: robertc at robertcollins.net-20071029165400-vewpp1vwd60ycibq
            parent: robertc at robertcollins.net-20071030173911-ams9jk9pw8uein0j
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Wed 2007-10-31 05:05:32 +1100
            message:
              Merge merge improvements.
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
              bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
              bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
              bzrlib/repofmt/weaverepo.py    presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
              bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
              bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
              bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
              bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.12
            revision-id:robertc at robertcollins.net-20071029165400-vewpp1vwd60ycibq
            parent: robertc at robertcollins.net-20071029034721-cdbsecglq7q5qsvz
            parent: robertc at robertcollins.net-20071029133535-yjj4ykvsr6ueqrvt
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Tue 2007-10-30 03:54:00 +1100
            message:
              Progress bar take two.
            modified:
              bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
              bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.11
            revision-id:robertc at robertcollins.net-20071029034721-cdbsecglq7q5qsvz
            parent: robertc at robertcollins.net-20071028191630-5rwo6sy9dguob5r6
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Mon 2007-10-29 14:47:21 +1100
            message:
              * A progress bar has been added for knitpack -> knitpack fetching.
                (Robert Collins, #157789)
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/progress.py             progress.py-20050610070202-df9faaab791964c0
              bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.10
            revision-id:robertc at robertcollins.net-20071028191630-5rwo6sy9dguob5r6
            parent: robertc at robertcollins.net-20071028173245-0jboqn9k9if01wq1
            parent: robertc at robertcollins.net-20071028190205-j7669ntq0jj7s5fl
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Mon 2007-10-29 06:16:30 +1100
            message:
              Merge pack push performance fix.
            modified:
              bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.9
            revision-id:robertc at robertcollins.net-20071028173245-0jboqn9k9if01wq1
            parent: robertc at robertcollins.net-20071025191858-1ptyjzomxhwrmehi
            parent: robertc at robertcollins.net-20071028173025-pk3c1b0kmr5x6l31
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Mon 2007-10-29 04:32:45 +1100
            message:
              Merge bzr.dev and export fix.
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
              bzrlib/export/__init__.py      __init__.py-20051114235828-1ba62cb4062304e6
              bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
              bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
              bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
              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/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
              bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
              bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
              bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
              bzrlib/tests/repository_implementations/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
              bzrlib/tests/test_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
              doc/developers/HACKING.txt     HACKING-20050805200004-2a5dc975d870f78c
              doc/developers/knitpack.txt    knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.8
            revision-id:robertc at robertcollins.net-20071025191858-1ptyjzomxhwrmehi
            parent: robertc at robertcollins.net-20071024224358-yh4vgktvgc7tnr1a
            parent: pqm at pqm.ubuntu.com-20071025100509-veed3zxqsmgwdug1
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Fri 2007-10-26 05:18:58 +1000
            message:
              Pack disk format bump.
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
              bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
              bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
              bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
              bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
              bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
              bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
              bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
              bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
              bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.7
            revision-id:robertc at robertcollins.net-20071024224358-yh4vgktvgc7tnr1a
            parent: robertc at robertcollins.net-20071024075138-ga16uc9y30zbx7pv
            parent: robertc at robertcollins.net-20071024223742-fhjlj7l6lu77s9zq
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Thu 2007-10-25 08:43:58 +1000
            message:
              Merge commit-delete performance improvements.
            added:
              bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
              bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
            modified:
              Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
              bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
              bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
              bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
              bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
              bzrlib/transport/__init__.py   transport.py-20050711165921-4978aa7ce1285ad5
              bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
              bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
              bzrlib/transport/remote.py     ssh.py-20060608202016-c25gvf1ob7ypbus6-1
              bzrlib/transport/sftp.py       sftp.py-20051019050329-ab48ce71b7e32dfe
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.6
            revision-id:robertc at robertcollins.net-20071024075138-ga16uc9y30zbx7pv
            parent: robertc at robertcollins.net-20071024061048-rb8hsmwonvfjc4nd
            parent: pqm at pqm.ubuntu.com-20071024072800-p2qtv2632xrbrs02
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Wed 2007-10-24 17:51:38 +1000
            message:
              Merge bzr.dev.
            added:
              doc/developers/knitpack.txt    knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
            modified:
              bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
              bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
              bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
              bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
              bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
              bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
              bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
              bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
              bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
              bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
              bzrlib/tests/workingtree_implementations/test_unversion.py test_unversion.py-20060907074408-bygh2y28jz8u0cg7-1
              bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
              doc/developers/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
              doc/developers/repository.txt  repository.txt-20070709152006-xkhlek456eclha4u-1
              doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.5
            revision-id:robertc at robertcollins.net-20071024061048-rb8hsmwonvfjc4nd
            parent: robertc at robertcollins.net-20071024005634-0lved66u59xd9vlt
            parent: robertc at robertcollins.net-20071024054739-r4gjnintzwhnvg82
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Wed 2007-10-24 16:10:48 +1000
            message:
              Merge update_basis correctness fixes.
            added:
              bzrlib/tests/blackbox/test_check.py test_check.py-20071024054728-mn44rt3z5hnqcbke-1
            modified:
              bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
              bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
              bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
              bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
              bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.4
            revision-id:robertc at robertcollins.net-20071024005634-0lved66u59xd9vlt
            parent: robertc at robertcollins.net-20071023222241-iuqmck10xc2vz6xr
            parent: robertc at robertcollins.net-20071024002950-5gri1p7b9m8t821c
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Wed 2007-10-24 10:56:34 +1000
            message:
              Merge improved stat lookup during commit.
            modified:
              bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
              bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.3
            revision-id:robertc at robertcollins.net-20071023222241-iuqmck10xc2vz6xr
            parent: robertc at robertcollins.net-20071022061809-wg85fn4e5xje0x53
            parent: robertc at robertcollins.net-20071023221432-j8zndh1oiegql3cu
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Wed 2007-10-24 08:22:41 +1000
            message:
              Merge dirstate incremental update logic.
            modified:
              Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              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/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
              bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
              bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
              bzrlib/smtp_connection.py      smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
              bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
              bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
              bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
              bzrlib/tests/test_osutils.py   test_osutils.py-20051201224856-e48ee24c12182989
              bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
              bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
              bzrlib/tests/test_xml.py       test_xml.py-20050905091053-80b45588931a9b35
              bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
              bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
              bzrlib/xml5.py                 xml5.py-20050907032657-aac8f960815b66b1
              doc/en/user-guide/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.2
            revision-id:robertc at robertcollins.net-20071022061809-wg85fn4e5xje0x53
            parent: robertc at robertcollins.net-20071022054219-es6z1d4jqvet4rcp
            parent: robertc at robertcollins.net-20071022060819-eojcv6pifohuxyns
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Mon 2007-10-22 16:18:09 +1000
            message:
              Merge knit extract performance improvement.
            modified:
              NEWS                           NEWS-20050323055033-4e00b5db738777ff
              bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
            ------------------------------------------------------------
            revno: 2592.1.34.1.223.1.1
            revision-id:robertc at robertcollins.net-20071022054219-es6z1d4jqvet4rcp
            parent: robertc at robertcollins.net-20071022012351-16lm27an2lbzk038
            parent: robertc at robertcollins.net-20071022043300-c8sdvyizlgoy3i97
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: repository
            timestamp: Mon 2007-10-22 15:42:19 +1000
            message:
              Merge dirstate lookup cache.
            modified:
              bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
        ------------------------------------------------------------
        revno: 3035.1.2
        revision-id:pqm at pqm.ubuntu.com-20071127203256-inr45zjrbheqn618
        parent: pqm at pqm.ubuntu.com-20071127143838-lkx79x6q91uptc1o
        parent: john at arbash-meinel.com-20071127195108-k38ek6apyhxw75fv
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Tue 2007-11-27 20:32:56 +0000
        message:
          (John Arbash Meinel,
          	bug #59302) Quick audit for single quotes in our documentation.
        modified:
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
          doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
          doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
          doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
            ------------------------------------------------------------
            revno: 3035.2.1
            revision-id:john at arbash-meinel.com-20071127195108-k38ek6apyhxw75fv
            parent: pqm at pqm.ubuntu.com-20071127101459-zcdf4aia34927kt0
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: doc
            timestamp: Tue 2007-11-27 13:51:08 -0600
            message:
              Address bug #59302 and fix documentation that uses single quotes.
              Windows doesn't recognize ' as a quote character.
              So documentation should use: bzr foo -m "text" not bzr foo -m 'text'
              This patch is just a quick scan of documents for bzr.*', which should
              catch most of it.
            modified:
              bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
              doc/developers/performance-contributing.txt performancecontribut-20070621063612-ac4zhhagjzkr21qp-1
              doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
              doc/en/user-guide/bug_trackers.txt bug_trackers.txt-20070713223459-khxdlcudraii95uv-1
              doc/en/user-guide/setting_up_email.txt setting_up_email.txt-20060314161707-fd242c8944346173
        ------------------------------------------------------------
        revno: 3035.1.1
        revision-id:pqm at pqm.ubuntu.com-20071127143838-lkx79x6q91uptc1o
        parent: pqm at pqm.ubuntu.com-20071127101459-zcdf4aia34927kt0
        parent: abentley at panoramicfeedback.com-20071127135729-il5et0dxtsu05ceh
        committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
        branch nick: +trunk
        timestamp: Tue 2007-11-27 14:38:38 +0000
        message:
          Avoid using Tree.inventory (even indirectly) from diff command
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3009.2.29
        revision-id:abentley at panoramicfeedback.com-20071127135729-il5et0dxtsu05ceh
        parent: aaron.bentley at utoronto.ca-20071125215224-44ifs6un0hkvw6x9
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: no-inventory
        timestamp: Tue 2007-11-27 08:57:29 -0500
        message:
          Change constants to strings
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
        ------------------------------------------------------------
        revno: 3009.2.28
        revision-id:aaron.bentley at utoronto.ca-20071125215224-44ifs6un0hkvw6x9
        parent: aaron.bentley at utoronto.ca-20071125172110-fsz9owanvduc6yzx
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory
        timestamp: Sun 2007-11-25 16:52:24 -0500
        message:
          Add from_diff_tree factories
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
        ------------------------------------------------------------
        revno: 3009.2.27
        revision-id:aaron.bentley at utoronto.ca-20071125172110-fsz9owanvduc6yzx
        parent: aaron.bentley at utoronto.ca-20071125165321-be29tuiy92fb62l7
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory
        timestamp: Sun 2007-11-25 12:21:10 -0500
        message:
          Use extra_factories instead of extra_diffs
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
        ------------------------------------------------------------
        revno: 3009.2.26
        revision-id:aaron.bentley at utoronto.ca-20071125165321-be29tuiy92fb62l7
        parent: aaron.bentley at utoronto.ca-20071125164716-y48cfw87mxrfaok2
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory
        timestamp: Sun 2007-11-25 11:53:21 -0500
        message:
          Update NEWS
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
        ------------------------------------------------------------
        revno: 3009.2.25
        revision-id:aaron.bentley at utoronto.ca-20071125164716-y48cfw87mxrfaok2
        parent: aaron.bentley at utoronto.ca-20071124001331-74p3la8ucmdfoysz
        parent: aaron.bentley at utoronto.ca-20071124001242-5ipv4t02fzu7pf4q
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory
        timestamp: Sun 2007-11-25 11:47:16 -0500
        message:
          Merge dirstate fixes to avoid Tree.inventory during diff (#149254)
        modified:
          bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
            ------------------------------------------------------------
            revno: 3016.1.1
            revision-id:aaron.bentley at utoronto.ca-20071124001242-5ipv4t02fzu7pf4q
            parent: pqm at pqm.ubuntu.com-20071123043953-lv68pawzrpa4s9t9
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: no-inventory-dirstate
            timestamp: Fri 2007-11-23 19:12:42 -0500
            message:
              Update DirStateRevisionTree to avoid using inventory
            modified:
              bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
        ------------------------------------------------------------
        revno: 3009.2.24
        revision-id:aaron.bentley at utoronto.ca-20071124001331-74p3la8ucmdfoysz
        parent: aaron.bentley at utoronto.ca-20071123231449-5d73wnqnf8cqsv09
        parent: pqm at pqm.ubuntu.com-20071123043953-lv68pawzrpa4s9t9
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory
        timestamp: Fri 2007-11-23 19:13:31 -0500
        message:
          Merge bzr.dev
        added:
          bzrlib/switch.py               switch.py-20071116011000-v5lnw7d2wkng9eux-1
          bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
          bzrlib/tests/repository_implementations/test__generate_text_key_index.py test__generate_text_-20071114232121-00h9fd8qg8kjfa5k-1
          bzrlib/tests/repository_implementations/test_find_text_key_references.py test_find_text_key_r-20071114033605-v73bakal8x77qlfi-1
          bzrlib/tests/test_switch.py    test_switch.py-20071116011000-v5lnw7d2wkng9eux-2
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/annotate.py             annotate.py-20050922133147-7c60541d2614f022
          bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
          bzrlib/check.py                check.py-20050309040759-f3a679400c06bcc1
          bzrlib/graph.py                graph_walker.py-20070525030359-y852guab65d4wtn0-1
          bzrlib/msgeditor.py            msgeditor.py-20050901111708-ef6d8de98f5d8f2f
          bzrlib/reconcile.py            reweave_inventory.py-20051108164726-1e5e0934febac06e
          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/revision.py             revision.py-20050309040759-e77802c08f3999d5
          bzrlib/revisionspec.py         revisionspec.py-20050907152633-17567659fd5c0ddb
          bzrlib/sign_my_commits.py      sign_my_commits.py-20060215152201-5a6363365180e671
          bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
          bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
          bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
          bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
          bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
          bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
          bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
          bzrlib/tests/repository_implementations/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
          bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
          bzrlib/tests/test_annotate.py  test_annotate.py-20061213215015-sttc9agsxomls7q0-1
          bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
          bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
          bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
          bzrlib/tests/test_graph.py     test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
          bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
          bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
          bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
          bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
          bzrlib/transport/local.py      local_transport.py-20050711165921-9b1f142bfe480c24
        ------------------------------------------------------------
        revno: 3009.2.23
        revision-id:aaron.bentley at utoronto.ca-20071123231449-5d73wnqnf8cqsv09
        parent: aaron.bentley at utoronto.ca-20071123041928-zhoxs1r8onesojut
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory
        timestamp: Fri 2007-11-23 18:14:49 -0500
        message:
          Renaming fix
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
        ------------------------------------------------------------
        revno: 3009.2.22
        revision-id:aaron.bentley at utoronto.ca-20071123041928-zhoxs1r8onesojut
        parent: abentley at panoramicfeedback.com-20071122194330-1qjedkozl321kb1s
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory
        timestamp: Thu 2007-11-22 23:19:28 -0500
        message:
          Update names & docstring
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
        ------------------------------------------------------------
        revno: 3009.2.21
        revision-id:abentley at panoramicfeedback.com-20071122194330-1qjedkozl321kb1s
        parent: abentley at panoramicfeedback.com-20071122194250-nutd7qq7lfqc99am
        parent: pqm at pqm.ubuntu.com-20071122050938-la5hkrql1mag6u7p
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: no-inventory
        timestamp: Thu 2007-11-22 14:43:30 -0500
        message:
          Merge bzr.dev
        modified:
          NEWS                           NEWS-20050323055033-4e00b5db738777ff
          bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
          bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
          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/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
          bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
          bzrlib/tests/test_info.py      test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
          bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
        ------------------------------------------------------------
        revno: 3009.2.20
        revision-id:abentley at panoramicfeedback.com-20071122194250-nutd7qq7lfqc99am
        parent: abentley at panoramicfeedback.com-20071122190642-l5bq9d0mkk1cmyzd
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: no-inventory
        timestamp: Thu 2007-11-22 14:42:50 -0500
        message:
          PEP8
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
        ------------------------------------------------------------
        revno: 3009.2.19
        revision-id:abentley at panoramicfeedback.com-20071122190642-l5bq9d0mkk1cmyzd
        parent: abentley at panoramicfeedback.com-20071122182348-pbsce06az2i96yd3
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: no-inventory
        timestamp: Thu 2007-11-22 14:06:42 -0500
        message:
          Implement directory diffing
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
        ------------------------------------------------------------
        revno: 3009.2.18
        revision-id:abentley at panoramicfeedback.com-20071122182348-pbsce06az2i96yd3
        parent: abentley at panoramicfeedback.com-20071122182117-hs220sdlczwhy8zw
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: no-inventory
        timestamp: Thu 2007-11-22 13:23:48 -0500
        message:
          Change KindChangeDiffer's anti-recursion to avoid kind pairs with None
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
        ------------------------------------------------------------
        revno: 3009.2.17
        revision-id:abentley at panoramicfeedback.com-20071122182117-hs220sdlczwhy8zw
        parent: abentley at panoramicfeedback.com-20071122175232-w06vj7ucjl7gfygl
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: no-inventory
        timestamp: Thu 2007-11-22 13:21:17 -0500
        message:
          Update docs
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
        ------------------------------------------------------------
        revno: 3009.2.16
        revision-id:abentley at panoramicfeedback.com-20071122175232-w06vj7ucjl7gfygl
        parent: abentley at panoramicfeedback.com-20071122174639-gc0xuf2ws29aneet
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: no-inventory
        timestamp: Thu 2007-11-22 12:52:32 -0500
        message:
          Test support for extra differs
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
        ------------------------------------------------------------
        revno: 3009.2.15
        revision-id:abentley at panoramicfeedback.com-20071122174639-gc0xuf2ws29aneet
        parent: abentley at panoramicfeedback.com-20071122154848-jn89dr9kojaln6vu
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: no-inventory
        timestamp: Thu 2007-11-22 12:46:39 -0500
        message:
          Test differ registration
        modified:
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
        ------------------------------------------------------------
        revno: 3009.2.14
        revision-id:abentley at panoramicfeedback.com-20071122154848-jn89dr9kojaln6vu
        parent: abentley at panoramicfeedback.com-20071122151502-m9kwy2ums0gddyev
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: no-inventory
        timestamp: Thu 2007-11-22 10:48:48 -0500
        message:
          Update return type handling
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
        ------------------------------------------------------------
        revno: 3009.2.13
        revision-id:abentley at panoramicfeedback.com-20071122151502-m9kwy2ums0gddyev
        parent: aaron.bentley at utoronto.ca-20071122041411-xljgvcijantv9cdw
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: no-inventory
        timestamp: Thu 2007-11-22 10:15:02 -0500
        message:
          Refactor differ to support registering differ factories
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
        ------------------------------------------------------------
        revno: 3009.2.12
        revision-id:aaron.bentley at utoronto.ca-20071122041411-xljgvcijantv9cdw
        parent: aaron.bentley at utoronto.ca-20071122024735-4tsl5snv3zi4m3zg
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory
        timestamp: Wed 2007-11-21 23:14:11 -0500
        message:
          Associate labels with text diffing only
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
        ------------------------------------------------------------
        revno: 3009.2.11
        revision-id:aaron.bentley at utoronto.ca-20071122024735-4tsl5snv3zi4m3zg
        parent: abentley at panoramicfeedback.com-20071121174852-miztj0j1qgkpnk7w
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory
        timestamp: Wed 2007-11-21 21:47:35 -0500
        message:
          Refactor diff to be more pluggable
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
        ------------------------------------------------------------
        revno: 3009.2.10
        revision-id:abentley at panoramicfeedback.com-20071121174852-miztj0j1qgkpnk7w
        parent: abentley at panoramicfeedback.com-20071121173918-nb1j0nn9cxrfc53w
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: no-inventory
        timestamp: Wed 2007-11-21 12:48:52 -0500
        message:
          Remove trailing whitespace
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
        ------------------------------------------------------------
        revno: 3009.2.9
        revision-id:abentley at panoramicfeedback.com-20071121173918-nb1j0nn9cxrfc53w
        parent: abentley at panoramicfeedback.com-20071121161941-6au4zqgr4qgah2xc
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: no-inventory
        timestamp: Wed 2007-11-21 12:39:18 -0500
        message:
          Add tests for Differ
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/tests/test_diff.py      testdiff.py-20050727164403-d1a3496ebb12e339
        ------------------------------------------------------------
        revno: 3009.2.8
        revision-id:abentley at panoramicfeedback.com-20071121161941-6au4zqgr4qgah2xc
        parent: abentley at panoramicfeedback.com-20071121155930-bkgita4crkze2355
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: no-inventory
        timestamp: Wed 2007-11-21 11:19:41 -0500
        message:
          Support diffing without indirecting through inventory entries
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
        ------------------------------------------------------------
        revno: 3009.2.7
        revision-id:abentley at panoramicfeedback.com-20071121155930-bkgita4crkze2355
        parent: abentley at panoramicfeedback.com-20071121152730-ttbjijxcc88131zp
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: no-inventory
        timestamp: Wed 2007-11-21 10:59:30 -0500
        message:
          Move responsibility for generating diff labels into Differ.diff
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
        ------------------------------------------------------------
        revno: 3009.2.6
        revision-id:abentley at panoramicfeedback.com-20071121152730-ttbjijxcc88131zp
        parent: abentley at panoramicfeedback.com-20071121145546-dsbz0266amz9q1w3
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: no-inventory
        timestamp: Wed 2007-11-21 10:27:30 -0500
        message:
          Convert show_diff_trees into a Differ method
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
        ------------------------------------------------------------
        revno: 3009.2.5
        revision-id:abentley at panoramicfeedback.com-20071121145546-dsbz0266amz9q1w3
        parent: abentley at panoramicfeedback.com-20071121140853-yc9zlb4ct58x2j5b
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: no-inventory
        timestamp: Wed 2007-11-21 09:55:46 -0500
        message:
          Factor symlink and file diffing into differ
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
        ------------------------------------------------------------
        revno: 3009.2.4
        revision-id:abentley at panoramicfeedback.com-20071121140853-yc9zlb4ct58x2j5b
        parent: abentley at panoramicfeedback.com-20071121140303-eil5haph3u2ovwjg
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: no-inventory
        timestamp: Wed 2007-11-21 09:08:53 -0500
        message:
          Make old_tree/new_tree construction parameters of Differ
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
        ------------------------------------------------------------
        revno: 3009.2.3
        revision-id:abentley at panoramicfeedback.com-20071121140303-eil5haph3u2ovwjg
        parent: aaron.bentley at utoronto.ca-20071121132138-trbirzab46iqw2np
        committer: Aaron Bentley <abentley at panoramicfeedback.com>
        branch nick: no-inventory
        timestamp: Wed 2007-11-21 09:03:03 -0500
        message:
          Detect missing files from inv operation
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
        ------------------------------------------------------------
        revno: 3009.2.2
        revision-id:aaron.bentley at utoronto.ca-20071121132138-trbirzab46iqw2np
        parent: aaron.bentley at utoronto.ca-20071121130300-ml2xmnf5uod3de1q
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory
        timestamp: Wed 2007-11-21 08:21:38 -0500
        message:
          Implement Differ object for abstracting diffing
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
        ------------------------------------------------------------
        revno: 3009.2.1
        revision-id:aaron.bentley at utoronto.ca-20071121130300-ml2xmnf5uod3de1q
        parent: pqm at pqm.ubuntu.com-20071120221348-g9syrz6y7xcannkb
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: no-inventory
        timestamp: Wed 2007-11-21 08:03:00 -0500
        message:
          Provide Tree interface for diffing files
        modified:
          bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
          bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
    ------------------------------------------------------------
    revno: 2951.1.10.1.5
    revision-id:robertc at robertcollins.net-20071114003450-4dm5g7tytjdjo9su
    parent: robertc at robertcollins.net-20071112205003-kkwjbx5xxj6tosmi
    parent: pqm at pqm.ubuntu.com-20071114000124-2rkxwrcwid2wgcqn
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile
    timestamp: Wed 2007-11-14 11:34:50 +1100
    message:
      Merge bzr.dev.
    added:
      bzrlib/tests/tree_implementations/test_get_root_id.py test_get_root_id.py-20071026191509-a4conhr43f194avv-1
      doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
      bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
      bzrlib/fetch.py                fetch.py-20050818234941-26fea6105696365d
      bzrlib/knit.py                 knit.py-20051212171256-f056ac8f0fbe1bd9
      bzrlib/memorytree.py           memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
      bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
      bzrlib/pack.py                 container.py-20070607160755-tr8zc26q18rn0jnb-1
      bzrlib/plugin.py               plugin.py-20050622060424-829b654519533d69
      bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
      bzrlib/plugins/launchpad/lp_indirect.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
      bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
      bzrlib/plugins/launchpad/test_lp_indirect.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
      bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
      bzrlib/smart/__init__.py       __init__.py-20061101100249-8jwwl0d3jr080zim-1
      bzrlib/smart/protocol.py       protocol.py-20061108035435-ot0lstk2590yqhzr-1
      bzrlib/smart/request.py        request.py-20061108095550-gunadhxmzkdjfeek-1
      bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-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_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
      bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
      bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
      bzrlib/tests/test_knit.py      test_knit.py-20051212171302-95d4c00dd5f11f2b
      bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
      bzrlib/tests/test_pack.py      test_container.py-20070607160755-tr8zc26q18rn0jnb-2
      bzrlib/tests/test_plugins.py   plugins.py-20050622075746-32002b55e5e943e9
      bzrlib/tests/test_smart.py     test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
      bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
      bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
      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_unversion.py test_unversion.py-20060907074408-bygh2y28jz8u0cg7-1
      bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
      bzrlib/trace.py                trace.py-20050309040759-c8ed824bdcd4748a
      bzrlib/transform.py            transform.py-20060105172343-dd99e54394d91687
      bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
      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/index.txt       index.txt-20070508041241-qznziunkg0nffhiw-1
    ------------------------------------------------------------
    revno: 2951.1.10.1.4
    revision-id:robertc at robertcollins.net-20071112205003-kkwjbx5xxj6tosmi
    parent: robertc at robertcollins.net-20071104225308-5hr23xw3jirl9mne
    parent: pqm at pqm.ubuntu.com-20071112195430-0xgqswqpc1j2pk2m
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile
    timestamp: Tue 2007-11-13 07:50:03 +1100
    message:
      Merge bzr.dev.
    added:
      bzrlib/tests/blackbox/test_check.py test_check.py-20071024054728-mn44rt3z5hnqcbke-1
    modified:
      Makefile                       Makefile-20050805140406-d96e3498bb61c5bb
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
      bzr                            bzr.py-20050313053754-5485f144c7006fa6
      bzrlib/__init__.py             __init__.py-20050309040759-33e65acf91bbcd5d
      bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
      bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
      bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
      bzrlib/export/__init__.py      __init__.py-20051114235828-1ba62cb4062304e6
      bzrlib/help_topics.py          help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
      bzrlib/info.py                 info.py-20050323235939-6bbfe7d9700b0b9b
      bzrlib/lazy_import.py          lazy_import.py-20060910203832-f77c54gf3n232za0-1
      bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
      bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
      bzrlib/symbol_versioning.py    symbol_versioning.py-20060105104851-9ecf8af605d15a80
      bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
      bzrlib/tests/blackbox/test_exceptions.py test_exceptions.py-20060604211237-yi2cxg0ose3xk4id-1
      bzrlib/tests/blackbox/test_non_ascii.py test_non_ascii.py-20060105214030-68010be784a5d854
      bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
      bzrlib/tests/branch_implementations/test_create_checkout.py test_create_checkout-20070322193723-n2wkp1g03r0404di-1
      bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
      bzrlib/tests/ftp_server.py     ftpserver.py-20071019102346-61jbvdkrr70igauv-1
      bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
      bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
      bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
      bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
      bzrlib/tests/workingtree_implementations/test_walkdirs.py test_walkdirs.py-20060731045042-ch366w6dve2m7ro9-1
      bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
      bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
      bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
      doc/developers/knitpack.txt    knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
      tools/win32/bzr-win32-bdist-postinstall.py bzrwin32bdistpostinstall.py-20060629085133-098bsfj3va8jc0ql-1
    ------------------------------------------------------------
    revno: 2951.1.10.1.3
    revision-id:robertc at robertcollins.net-20071104225308-5hr23xw3jirl9mne
    parent: robertc at robertcollins.net-20071104204820-8a8tz6g8kiu1in4h
    parent: pqm at pqm.ubuntu.com-20071104224734-8l8km2gqk9n1pdla
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile
    timestamp: Mon 2007-11-05 09:53:08 +1100
    message:
      Merge .dev.
    modified:
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
    ------------------------------------------------------------
    revno: 2951.1.10.1.2
    revision-id:robertc at robertcollins.net-20071104204820-8a8tz6g8kiu1in4h
    parent: robertc at robertcollins.net-20071104204151-amehfv5prpvhn92c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile
    timestamp: Mon 2007-11-05 07:48:20 +1100
    message:
      Factor out inventory text copying in Packer to a single helper method.
    modified:
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
    ------------------------------------------------------------
    revno: 2951.1.10.1.1
    revision-id:robertc at robertcollins.net-20071104204151-amehfv5prpvhn92c
    parent: robertc at robertcollins.net-20071104203532-6vndyb5pv82em6n7
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: reconcile
    timestamp: Mon 2007-11-05 07:41:51 +1100
    message:
      Factor out revision text copying in Packer to a single helper method.
    modified:
      bzrlib/repofmt/pack_repo.py    pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
-------------- next part --------------

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


More information about the bazaar-commits mailing list