Rev 2322: (robertc) Merge dirstate and subtrees. (Robert Collins, Martin Pool, Aaaron Bentley, John A Meinel, James Westby) in http://people.ubuntu.com/~robertc/baz2.0/integration

Robert Collins robertc at robertcollins.net
Wed Mar 7 08:03:05 GMT 2007


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

------------------------------------------------------------
revno: 2322
revision-id: robertc at robertcollins.net-20070307080258-fi172acyjga89fz5
parent: pqm at pqm.ubuntu.com-20070306155943-73eafa9adb83ea73
parent: robertc at robertcollins.net-20070307080048-zxljn4k8ydbi12py
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2007-03-07 19:02:58 +1100
message:
  (robertc) Merge dirstate and subtrees. (Robert Collins, Martin Pool, Aaaron Bentley, John A Meinel, James Westby)
added:
  bzrlib/dirstate.py             dirstate.py-20060728012006-d6mvoihjb3je9peu-1
  bzrlib/tests/blackbox/test_join.py test_join.py-20060928210902-95dkqa6boh8uq92b-1
  bzrlib/tests/blackbox/test_split.py test_split.py-20061008023421-qy0vdpzysh5rriu8-1
  bzrlib/tests/test_dirstate.py  test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
  bzrlib/tests/test_extract.py   test_extract.py-20061002214140-qdnnm67q1ov6x6pd-1
  bzrlib/tests/test_subsume.py   test_subsume.py-20060927040024-tsvh4pchajoayymg-1
  bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
  bzrlib/tests/tree_implementations/test_get_file_mtime.py test_get_file_mtime.-20070301003805-kjkpwfp4whbm39o1-1
  bzrlib/tests/tree_implementations/test_get_symlink_target.py test_get_symlink_tar-20070225165554-ickod3w3t7u0zzqh-1
  bzrlib/tests/tree_implementations/test_list_files.py test_list_files.py-20070216005501-cjh6fzprbe9lbs2t-1
  bzrlib/tests/tree_implementations/test_revision_tree.py test_revision_tree.p-20060908041847-n15ngjoxpivwls0v-1
  bzrlib/tests/tree_implementations/test_walkdirs.py test_walkdirs.py-20060729160421-gmjnkotqgxdh98ce-1
  bzrlib/tests/workingtree_implementations/test_add.py test_add.py-20070226165239-4vo178spkrnhavc7-1
  bzrlib/tests/workingtree_implementations/test_add_reference.py test_add_reference.p-20061211024451-yo9i1691dgbv1eyn-1
  bzrlib/tests/workingtree_implementations/test_basis_tree.py test_basis_tree.py-20070216005613-85tsdbzarlx088wg-1
  bzrlib/tests/workingtree_implementations/test_move.py test_move.py-20070225171927-mohn2vqj5fx7edc6-1
  bzrlib/tests/workingtree_implementations/test_nested_specifics.py test_nested_specific-20070306004443-qut978c488jr11sg-1
  bzrlib/tests/workingtree_implementations/test_paths2ids.py test_paths2ids.py-20070222011621-kesvovdwm69nndtx-1
  bzrlib/tests/workingtree_implementations/test_rename_one.py test_rename_one.py-20070226161242-2d8ibdedl700jgio-1
  bzrlib/tests/workingtree_implementations/test_revision_tree.py test_revision_tree.p-20060908041847-n15ngjoxpivwls0v-2
  bzrlib/tests/workingtree_implementations/test_smart_add.py test_smart_add.py-20070215175752-9s5mxoz8aqpd80fm-1
  bzrlib/tests/workingtree_implementations/test_walkdirs.py test_walkdirs.py-20060731045042-ch366w6dve2m7ro9-1
  bzrlib/workingtree_4.py        workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
  bzrlib/xml7.py                 xml7.py-20061029182747-d5tiiny21bvrd2jj-1
modified:
  BRANCH.TODO                    BRANCH.TODO-20060103052123-79ac4969351c03a9
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
  bzrlib/add.py                  add.py-20050323030017-3a77d63feda58e33
  bzrlib/benchmarks/bench_status.py bench_status.py-20060520215801-2cc60f6da5625927
  bzrlib/benchmarks/bench_workingtree.py bench_workingtree.py-20060527061822-cxrgsa9ax2q4d82q-1
  bzrlib/branch.py               branch.py-20050309040759-e4baf4e0d046576e
  bzrlib/builtins.py             builtins.py-20050830033751-fc01482b9ca23183
  bzrlib/bzrdir.py               bzrdir.py-20060131065624-156dfea39c4387cb
  bzrlib/cache_utf8.py           cache_utf8.py-20060810004311-x4cph46la06h9azm-1
  bzrlib/commit.py               commit.py-20050511101309-79ec1a0168e0e825
  bzrlib/delta.py                delta.py-20050729221636-54cf14ef94783d0a
  bzrlib/diff.py                 diff.py-20050309040759-26944fbbf2ebbf36
  bzrlib/errors.py               errors.py-20050309040759-20512168c4e14fbd
  bzrlib/hashcache.py            hashcache.py-20050706091756-fe3a8cc1143ff24f
  bzrlib/inventory.py            inventory.py-20050309040759-6648b84ca2005b37
  bzrlib/lock.py                 lock.py-20050527050856-ec090bb51bc03349
  bzrlib/merge.py                merge.py-20050513021216-953b65a438527106
  bzrlib/mutabletree.py          mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
  bzrlib/osutils.py              osutils.py-20050309040759-eeaff12fbf77ac86
  bzrlib/repofmt/knitrepo.py     knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
  bzrlib/repository.py           rev_storage.py-20051111201905-119e9401e46257e3
  bzrlib/revisiontree.py         revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
  bzrlib/status.py               status.py-20050505062338-431bfa63ec9b19e6
  bzrlib/tests/__init__.py       selftest.py-20050531073622-8d0e3c8845c97a64
  bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
  bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
  bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
  bzrlib/tests/blackbox/test_break_lock.py test_break_lock.py-20060303014503-a90e07d38d042d1d
  bzrlib/tests/blackbox/test_cat.py test_cat.py-20051201162916-f0937e4e19ea24b3
  bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
  bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
  bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
  bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
  bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
  bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
  bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
  bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
  bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
  bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
  bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
  bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
  bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
  bzrlib/tests/repository_implementations/test_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
  bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
  bzrlib/tests/test_bad_files.py test_bad_files.py-20050918155938-c76a2295c8ab9503
  bzrlib/tests/test_branch.py    test_branch.py-20060116013032-97819aa07b8ab3b5
  bzrlib/tests/test_bundle.py    test.py-20050630184834-092aa401ab9f039c
  bzrlib/tests/test_bzrdir.py    test_bzrdir.py-20060131065654-deba40eef51cf220
  bzrlib/tests/test_cache_utf8.py test_cache_utf8.py-20060810004311-x4cph46la06h9azm-2
  bzrlib/tests/test_commit.py    test_commit.py-20050914060732-279f057f8c295434
  bzrlib/tests/test_conflicts.py test_conflicts.py-20051006031059-e2dad9bbeaa5891f
  bzrlib/tests/test_delta.py     test_delta.py-20070110134455-sqpd1y7mbjndelxf-1
  bzrlib/tests/test_errors.py    test_errors.py-20060210110251-41aba2deddf936a8
  bzrlib/tests/test_fetch.py     testfetch.py-20050825090644-f73e07e7dfb1765a
  bzrlib/tests/test_inv.py       testinv.py-20050722220913-1dc326138d1a5892
  bzrlib/tests/test_merge.py     testmerge.py-20050905070950-c1b5aa49ff911024
  bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
  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_selftest.py  test_selftest.py-20051202044319-c110a115d8c0456a
  bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
  bzrlib/tests/test_tag.py       test_tag.py-20070212110532-91cw79inah2cfozx-2
  bzrlib/tests/test_testament.py testtestament.py-20051011100429-5df1657310caa929
  bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
  bzrlib/tests/test_tree.py      test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
  bzrlib/tests/test_upgrade.py   test_upgrade.py-20051004040251-555fe1d2bae1bc71
  bzrlib/tests/test_workingtree.py testworkingtree.py-20051004024258-b88d0fe8f101d468
  bzrlib/tests/test_xml.py       test_xml.py-20050905091053-80b45588931a9b35
  bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
  bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
  bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
  bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
  bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
  bzrlib/tests/workingtree_implementations/test_break_lock.py test_break_lock.py-20060504115740-233e245df546fd42
  bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
  bzrlib/tests/workingtree_implementations/test_executable.py test_executable.py-20060628162557-tr7h57kl80l3ma8i-1
  bzrlib/tests/workingtree_implementations/test_read_working_inventory.py test_read_working_in-20061005073432-585uyj0sua6r7i9v-2
  bzrlib/tests/workingtree_implementations/test_readonly.py test_readonly.py-20061219164256-7imbl63m4j15n0es-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/transform.py            transform.py-20060105172343-dd99e54394d91687
  bzrlib/tree.py                 tree.py-20050309040759-9d5f2496be663e77
  bzrlib/version_info_formats/__init__.py generate_version_info.py-20051228204928-8358edabcddcd97e
  bzrlib/workingtree.py          workingtree.py-20050511021032-29b6ec0a681e02e3
  bzrlib/xml5.py                 xml5.py-20050907032657-aac8f960815b66b1
  bzrlib/xml6.py                 xml6.py-20060823042456-dbaaq4atrche7xy5-1
    ------------------------------------------------------------
    revno: 2255.2.239
    merged: robertc at robertcollins.net-20070307080048-zxljn4k8ydbi12py
    parent: robertc at robertcollins.net-20070307060453-57bjf3z967sc6cda
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-03-07 19:00:48 +1100
    message:
      Change from adler to crc checksums, as adler32 in python is not stable from 32 to 64 bit systems.
    ------------------------------------------------------------
    revno: 2255.2.238
    merged: robertc at robertcollins.net-20070307060453-57bjf3z967sc6cda
    parent: robertc at robertcollins.net-20070307054158-j7yh62s59nz3rqdy
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-03-07 17:04:53 +1100
    message:
      Fix annotate_iter to lock the basis tree appropriately.
    ------------------------------------------------------------
    revno: 2255.2.237
    merged: robertc at robertcollins.net-20070307054158-j7yh62s59nz3rqdy
    parent: mbp at sourcefrog.net-20070307030914-fb2gw9ae6lxcbbcd
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-03-07 16:41:58 +1100
    message:
      Update NEWS and clean out BRANCH.TODO.
    ------------------------------------------------------------
    revno: 2255.2.236
    merged: mbp at sourcefrog.net-20070307030914-fb2gw9ae6lxcbbcd
    parent: mbp at sourcefrog.net-20070307013155-kxvc6ppleyv8jswg
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate
    timestamp: Wed 2007-03-07 14:09:14 +1100
    message:
      Review cleanups: mostly updating or removing todo comments.
    ------------------------------------------------------------
    revno: 2255.2.235
    merged: mbp at sourcefrog.net-20070307013155-kxvc6ppleyv8jswg
    parent: robertc at robertcollins.net-20070307011411-0cmmc8atx67v3nv7
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate
    timestamp: Wed 2007-03-07 12:31:55 +1100
    message:
      Add blackbox test that join gives clean error when the repository doesn't support rich roots
    ------------------------------------------------------------
    revno: 2255.2.234
    merged: robertc at robertcollins.net-20070307011411-0cmmc8atx67v3nv7
    parent: john at arbash-meinel.com-20070307010431-xjvtqmf6aqeyosy1
    parent: pqm at pqm.ubuntu.com-20070306155943-73eafa9adb83ea73
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-03-07 12:14:11 +1100
    message:
      Merge bzr.dev.
    ------------------------------------------------------------
    revno: 2255.2.233
    merged: john at arbash-meinel.com-20070307010431-xjvtqmf6aqeyosy1
    parent: robertc at robertcollins.net-20070306225507-natrr5l50ppfndpz
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Tue 2007-03-06 19:04:31 -0600
    message:
      DirState.initialize returns a locked state, unlock as part of cleanup.
    ------------------------------------------------------------
    revno: 2255.2.232
    merged: robertc at robertcollins.net-20070306225507-natrr5l50ppfndpz
    parent: robertc at robertcollins.net-20070306214551-ayvx2ziz2hgbkqm0
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Wed 2007-03-07 09:55:07 +1100
    message:
      Make WorkingTree4 report support for references based on the repositories capabilities.
    ------------------------------------------------------------
    revno: 2255.2.231
    merged: robertc at robertcollins.net-20070306214551-ayvx2ziz2hgbkqm0
    parent: robertc at robertcollins.net-20070306134733-gx8sio7eqnhfi3zn
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Wed 2007-03-07 08:45:51 +1100
    message:
      Add test showing reverts UI working as Aaron intended it to.
    ------------------------------------------------------------
    revno: 2255.2.230
    merged: robertc at robertcollins.net-20070306134733-gx8sio7eqnhfi3zn
    parent: robertc at robertcollins.net-20070306132101-cj5e3d7d6834f80o
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Wed 2007-03-07 00:47:33 +1100
    message:
      Update tree format signatures to mention introducing bzr version.
    ------------------------------------------------------------
    revno: 2255.2.229
    merged: robertc at robertcollins.net-20070306132101-cj5e3d7d6834f80o
    parent: robertc at robertcollins.net-20070306130853-1k6knym5pxf1jcns
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Wed 2007-03-07 00:21:01 +1100
    message:
      Fix remaining test failures.
    ------------------------------------------------------------
    revno: 2255.2.228
    merged: robertc at robertcollins.net-20070306130853-1k6knym5pxf1jcns
    parent: robertc at robertcollins.net-20070306125822-gs9rgs7v2erqgf2d
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Wed 2007-03-07 00:08:53 +1100
    message:
      Make all test_add_reference tests pass again.
    ------------------------------------------------------------
    revno: 2255.2.227
    merged: robertc at robertcollins.net-20070306125822-gs9rgs7v2erqgf2d
    parent: robertc at robertcollins.net-20070306122818-xk0lc3l01ecl6vbc
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 23:58:22 +1100
    message:
      Make all test_commit tests pass.
    ------------------------------------------------------------
    revno: 2255.2.226
    merged: robertc at robertcollins.net-20070306122818-xk0lc3l01ecl6vbc
    parent: mbp at sourcefrog.net-20070306121306-n387xz1h5aguv1he
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 23:28:18 +1100
    message:
      Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.
    ------------------------------------------------------------
    revno: 2255.2.225
    merged: mbp at sourcefrog.net-20070306121306-n387xz1h5aguv1he
    parent: mbp at sourcefrog.net-20070306120030-2m551vgy28ma9kn0
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate
    timestamp: Tue 2007-03-06 23:13:06 +1100
    message:
      Prohibit dirstate from getting entries called ..
    ------------------------------------------------------------
    revno: 2255.2.224
    merged: mbp at sourcefrog.net-20070306120030-2m551vgy28ma9kn0
    parent: mbp at sourcefrog.net-20070306112615-493rbu77ars2g8vt
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate
    timestamp: Tue 2007-03-06 23:00:30 +1100
    message:
      TestBranch6 doesn't need to do add('.')
    ------------------------------------------------------------
    revno: 2255.2.223
    merged: mbp at sourcefrog.net-20070306112615-493rbu77ars2g8vt
    parent: mbp at sourcefrog.net-20070306111631-gfhevzp0oi5kx7hw
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate
    timestamp: Tue 2007-03-06 22:26:15 +1100
    message:
      add stubbed out join blackbox test
    ------------------------------------------------------------
    revno: 2255.2.222
    merged: mbp at sourcefrog.net-20070306111631-gfhevzp0oi5kx7hw
    parent: robertc at robertcollins.net-20070306110403-37dnhgg7rshx97mp
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate
    timestamp: Tue 2007-03-06 22:16:31 +1100
    message:
      Add DirState repr so we get meaningful messages
    ------------------------------------------------------------
    revno: 2255.2.221
    merged: robertc at robertcollins.net-20070306110403-37dnhgg7rshx97mp
    parent: robertc at robertcollins.net-20070306105127-tdec4zgv1tkfgi1d
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 22:04:03 +1100
    message:
      Remove unused function.
    ------------------------------------------------------------
    revno: 2255.2.220
    merged: robertc at robertcollins.net-20070306105127-tdec4zgv1tkfgi1d
    parent: mbp at sourcefrog.net-20070306104738-ua4ifiix8zuvhv87
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 21:51:27 +1100
    message:
      Fix failing detection of changes restricted to subtrees causing spurious pointless commit errors.
    ------------------------------------------------------------
    revno: 2255.2.219
    merged: mbp at sourcefrog.net-20070306104738-ua4ifiix8zuvhv87
    parent: robertc at robertcollins.net-20070306102901-y25mgksdvocjmib8
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate
    timestamp: Tue 2007-03-06 21:47:38 +1100
    message:
      fix unbound local error in cmd_join
    ------------------------------------------------------------
    revno: 2255.2.218
    merged: robertc at robertcollins.net-20070306102901-y25mgksdvocjmib8
    parent: mbp at sourcefrog.net-20070306102233-xr93c99y5y7pod64
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 21:29:01 +1100
    message:
      Make the nested tree commit smoke test be more rigourous.
    ------------------------------------------------------------
    revno: 2255.2.217
    merged: mbp at sourcefrog.net-20070306102233-xr93c99y5y7pod64
    parent: robertc at robertcollins.net-20070306092410-7ls3yg0dk1l0b2dj
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate
    timestamp: Tue 2007-03-06 21:22:33 +1100
    message:
      docs
    ------------------------------------------------------------
    revno: 2255.2.216
    merged: robertc at robertcollins.net-20070306092410-7ls3yg0dk1l0b2dj
    parent: robertc at robertcollins.net-20070306091708-p46394jg9hg5jzjq
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 20:24:10 +1100
    message:
      simplify merge_nested tests.
    ------------------------------------------------------------
    revno: 2255.2.215
    merged: robertc at robertcollins.net-20070306091708-p46394jg9hg5jzjq
    parent: robertc at robertcollins.net-20070306084140-10rlo4bozpfvuebh
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 20:17:08 +1100
    message:
      Hook directory-tree-reference detection into dirstate _iter_changes.
    ------------------------------------------------------------
    revno: 2255.2.214
    merged: robertc at robertcollins.net-20070306084140-10rlo4bozpfvuebh
    parent: robertc at robertcollins.net-20070306072420-xfvlsmm6hw0rrqe9
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 19:41:40 +1100
    message:
      Get _iter_changes on dirstate passing the subtree tests.
    ------------------------------------------------------------
    revno: 2255.2.213
    merged: robertc at robertcollins.net-20070306072420-xfvlsmm6hw0rrqe9
    parent: robertc at robertcollins.net-20070306065234-iq1i2xm003oxvaoi
    parent: mbp at sourcefrog.net-20070306050546-3lujsd390sq65um0
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 18:24:20 +1100
    message:
      Merge Martin.
        ------------------------------------------------------------
        revno: 2255.2.206.1.1
        merged: mbp at sourcefrog.net-20070306050546-3lujsd390sq65um0
        parent: mbp at sourcefrog.net-20070306035757-8633p96f76gzzgg5
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: subtree
        timestamp: Tue 2007-03-06 16:05:46 +1100
        message:
          Add BzrDir.retire_bzrdir and partly fix subsume
    ------------------------------------------------------------
    revno: 2255.2.212
    merged: robertc at robertcollins.net-20070306065234-iq1i2xm003oxvaoi
    parent: robertc at robertcollins.net-20070306063500-ihgarcmlv48p2gu0
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 17:52:34 +1100
    message:
      Fix upgrade bug exposed via repository tests, dont replace dirstate format trees during upgrade.
    ------------------------------------------------------------
    revno: 2255.2.211
    merged: robertc at robertcollins.net-20070306063500-ihgarcmlv48p2gu0
    parent: robertc at robertcollins.net-20070306052123-xfits0qiztraqs7m
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 17:35:00 +1100
    message:
      Remove knit2 repository format- it has never been supported.
    ------------------------------------------------------------
    revno: 2255.2.210
    merged: robertc at robertcollins.net-20070306052123-xfits0qiztraqs7m
    parent: robertc at robertcollins.net-20070306051023-3bd91ashnq3ppdkh
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 16:21:23 +1100
    message:
      Fix test_join with dirstate default.
    ------------------------------------------------------------
    revno: 2255.2.209
    merged: robertc at robertcollins.net-20070306051023-3bd91ashnq3ppdkh
    parent: robertc at robertcollins.net-20070306042050-as7r5l839l2yiks0
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 16:10:23 +1100
    message:
      Remove circular imports in bzrdir format definitions.
    ------------------------------------------------------------
    revno: 2255.2.208
    merged: robertc at robertcollins.net-20070306042050-as7r5l839l2yiks0
    parent: robertc at robertcollins.net-20070306040616-0m74enszgwqd5iid
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 15:20:50 +1100
    message:
      Remove more references to 'experimental' formats.
    ------------------------------------------------------------
    revno: 2255.2.207
    merged: robertc at robertcollins.net-20070306040616-0m74enszgwqd5iid
    parent: mbp at sourcefrog.net-20070306035757-8633p96f76gzzgg5
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 15:06:16 +1100
    message:
      Reinstate format change for test_workingtree_4
    ------------------------------------------------------------
    revno: 2255.2.206
    merged: mbp at sourcefrog.net-20070306035757-8633p96f76gzzgg5
    parent: mbp at sourcefrog.net-20070306033644-x3nw3eqytkbuig9q
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: subtree
    timestamp: Tue 2007-03-06 14:57:57 +1100
    message:
      Remove duplicate test_unique_root_id_per_tree
    ------------------------------------------------------------
    revno: 2255.2.205
    merged: mbp at sourcefrog.net-20070306033644-x3nw3eqytkbuig9q
    parent: robertc at robertcollins.net-20070306023715-0ly3m7xrl29pgvn0
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: subtree
    timestamp: Tue 2007-03-06 14:36:44 +1100
    message:
      factor out WorkingTree4._directory_is_tree_reference
    ------------------------------------------------------------
    revno: 2255.2.204
    merged: robertc at robertcollins.net-20070306023715-0ly3m7xrl29pgvn0
    parent: mbp at sourcefrog.net-20070306023028-eqnd3kfvn19hwl26
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 13:37:15 +1100
    message:
      Fix info and status again.
    ------------------------------------------------------------
    revno: 2255.2.203
    merged: mbp at sourcefrog.net-20070306023028-eqnd3kfvn19hwl26
    parent: mbp at sourcefrog.net-20070306022326-3yj7nwipfi6xegu1
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: subtree
    timestamp: Tue 2007-03-06 13:30:28 +1100
    message:
      doc
    ------------------------------------------------------------
    revno: 2255.2.202
    merged: mbp at sourcefrog.net-20070306022326-3yj7nwipfi6xegu1
    parent: robertc at robertcollins.net-20070306020408-xjicm1vcxd0mhuvd
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: subtree
    timestamp: Tue 2007-03-06 13:23:26 +1100
    message:
      WorkingTree_4.kind should report tree-references if they're
      branches on disk, regardless of what's in the working dirstate.
      
      Add a per-workingtree test that mixes up the kinds of files and 
      reads them back.
    ------------------------------------------------------------
    revno: 2255.2.201
    merged: robertc at robertcollins.net-20070306020408-xjicm1vcxd0mhuvd
    parent: mbp at sourcefrog.net-20070306015734-kpimc8npv6b3fr4k
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 13:04:08 +1100
    message:
      Test_info needed updating after freezing the meaning of 'knit' format dirs.
    ------------------------------------------------------------
    revno: 2255.2.200
    merged: mbp at sourcefrog.net-20070306015734-kpimc8npv6b3fr4k
    parent: robertc at robertcollins.net-20070306014805-w2cfio713i2pv6oe
    parent: mbp at sourcefrog.net-20070306013713-f88tleofav7dmjzj
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: subtree
    timestamp: Tue 2007-03-06 12:57:34 +1100
    message:
      Add simple test for WorkingTree.kind
        ------------------------------------------------------------
        revno: 2255.2.191.2.4
        merged: mbp at sourcefrog.net-20070306013713-f88tleofav7dmjzj
        parent: mbp at sourcefrog.net-20070306012722-e91h0sxbcutqb4ng
        parent: robertc at robertcollins.net-20070306012824-syeqpq1kri661vp9
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: subtree
        timestamp: Tue 2007-03-06 12:37:13 +1100
        message:
          merge
        ------------------------------------------------------------
        revno: 2255.2.191.2.3
        merged: mbp at sourcefrog.net-20070306012722-e91h0sxbcutqb4ng
        parent: mbp at sourcefrog.net-20070306001752-nc3cg4q7wai9a53c
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: subtree
        timestamp: Tue 2007-03-06 12:27:22 +1100
        message:
          Comments and better assertions in InterDirStateTree
        ------------------------------------------------------------
        revno: 2255.2.191.2.2
        merged: mbp at sourcefrog.net-20070306001752-nc3cg4q7wai9a53c
        parent: mbp at sourcefrog.net-20070306001539-u50spfvz7v2c1pun
        parent: john at arbash-meinel.com-20070305212803-wowsk4ytx1x836tv
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: subtree
        timestamp: Tue 2007-03-06 11:17:52 +1100
        message:
          merge dirstate
        ------------------------------------------------------------
        revno: 2255.2.191.2.1
        merged: mbp at sourcefrog.net-20070306001539-u50spfvz7v2c1pun
        parent: mbp at sourcefrog.net-20070305064521-2ewp1qiqp3ils4ff
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: subtree
        timestamp: Tue 2007-03-06 11:15:39 +1100
        message:
          review fixes from robert
    ------------------------------------------------------------
    revno: 2255.2.199
    merged: robertc at robertcollins.net-20070306014805-w2cfio713i2pv6oe
    parent: robertc at robertcollins.net-20070306013710-itl1i2q0ld7bgdke
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 12:48:05 +1100
    message:
      Fix definition of knit format; typos are not good.
    ------------------------------------------------------------
    revno: 2255.2.198
    merged: robertc at robertcollins.net-20070306013710-itl1i2q0ld7bgdke
    parent: robertc at robertcollins.net-20070306012824-syeqpq1kri661vp9
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 12:37:10 +1100
    message:
      All test_join tests passing.
    ------------------------------------------------------------
    revno: 2255.2.197
    merged: robertc at robertcollins.net-20070306012824-syeqpq1kri661vp9
    parent: robertc at robertcollins.net-20070306011508-6ncdgqqlxb84esmr
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 12:28:24 +1100
    message:
      Get all working_4 tests passing.
    ------------------------------------------------------------
    revno: 2255.2.196
    merged: robertc at robertcollins.net-20070306011508-6ncdgqqlxb84esmr
    parent: robertc at robertcollins.net-20070306005352-axjk5vdian1wnyx9
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 12:15:08 +1100
    message:
      Fix test_upgrade defects related to non local or absent working trees.
    ------------------------------------------------------------
    revno: 2255.2.195
    merged: robertc at robertcollins.net-20070306005352-axjk5vdian1wnyx9
    parent: robertc at robertcollins.net-20070306002836-59i29dpv57h6i8a3
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 11:53:52 +1100
    message:
      Fix set_reference_revision on dirstate format trees.
    ------------------------------------------------------------
    revno: 2255.2.194
    merged: robertc at robertcollins.net-20070306002836-59i29dpv57h6i8a3
    parent: robertc at robertcollins.net-20070306002528-zkvfpjt0dwzwz85l
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 11:28:36 +1100
    message:
      [BROKEN] Many updates to stop using experimental formats in tests.
    ------------------------------------------------------------
    revno: 2255.2.193
    merged: robertc at robertcollins.net-20070306002528-zkvfpjt0dwzwz85l
    parent: john at arbash-meinel.com-20070305212803-wowsk4ytx1x836tv
    parent: robertc at robertcollins.net-20070305091133-bjk279of5h029hpg
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate.dogfood
    timestamp: Tue 2007-03-06 11:25:28 +1100
    message:
      Implement upgrade for working trees.
        ------------------------------------------------------------
        revno: 2255.2.191.1.1
        merged: robertc at robertcollins.net-20070305091133-bjk279of5h029hpg
        parent: mbp at sourcefrog.net-20070305064521-2ewp1qiqp3ils4ff
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate.dogfood
        timestamp: Mon 2007-03-05 20:11:33 +1100
        message:
          Implement upgrade for working trees.
    ------------------------------------------------------------
    revno: 2255.2.192
    merged: john at arbash-meinel.com-20070305212803-wowsk4ytx1x836tv
    parent: mbp at sourcefrog.net-20070305064521-2ewp1qiqp3ils4ff
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Mon 2007-03-05 15:28:03 -0600
    message:
      Add support for executable bit under win32
    ------------------------------------------------------------
    revno: 2255.2.191
    merged: mbp at sourcefrog.net-20070305064521-2ewp1qiqp3ils4ff
    parent: mbp at sourcefrog.net-20070305064503-mf6hwihhvgnf88wg
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: subtree
    timestamp: Mon 2007-03-05 17:45:21 +1100
    message:
      additional fix for subtree comparison
    ------------------------------------------------------------
    revno: 2255.2.190
    merged: mbp at sourcefrog.net-20070305064503-mf6hwihhvgnf88wg
    parent: mbp at sourcefrog.net-20070305063046-unnu602hw4j5jgrq
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: subtree
    timestamp: Mon 2007-03-05 17:45:03 +1100
    message:
      assertEqual can take an option message
    ------------------------------------------------------------
    revno: 2255.2.189
    merged: mbp at sourcefrog.net-20070305063046-unnu602hw4j5jgrq
    parent: mbp at sourcefrog.net-20070305061143-feioqg2poiixysp6
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: subtree
    timestamp: Mon 2007-03-05 17:30:46 +1100
    message:
      Add and fix up basic comparison of subtrees.
    ------------------------------------------------------------
    revno: 2255.2.188
    merged: mbp at sourcefrog.net-20070305061143-feioqg2poiixysp6
    parent: mbp at sourcefrog.net-20070305060734-xq5zyucm5puufr6z
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: subtree
    timestamp: Mon 2007-03-05 17:11:43 +1100
    message:
      Set common root id in comparison tests
    ------------------------------------------------------------
    revno: 2255.2.187
    merged: mbp at sourcefrog.net-20070305060734-xq5zyucm5puufr6z
    parent: mbp at sourcefrog.net-20070305055824-8pw7naoogm3ujbrx
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: subtree
    timestamp: Mon 2007-03-05 17:07:34 +1100
    message:
      set common root ids in more tests
    ------------------------------------------------------------
    revno: 2255.2.186
    merged: mbp at sourcefrog.net-20070305055824-8pw7naoogm3ujbrx
    parent: mbp at sourcefrog.net-20070305055805-xdc5z7z2o6c0n7ok
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: subtree
    timestamp: Mon 2007-03-05 16:58:24 +1100
    message:
      Fix up root id for some more comparison tests
    ------------------------------------------------------------
    revno: 2255.2.185
    merged: mbp at sourcefrog.net-20070305055805-xdc5z7z2o6c0n7ok
    parent: mbp at sourcefrog.net-20070305054951-gvy36e097zta9nyj
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: subtree
    timestamp: Mon 2007-03-05 16:58:05 +1100
    message:
      assertEqual uses pformat to show results
    ------------------------------------------------------------
    revno: 2255.2.184
    merged: mbp at sourcefrog.net-20070305054951-gvy36e097zta9nyj
    parent: mbp at sourcefrog.net-20070305050600-4oib0crvql5oiedd
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: subtree
    timestamp: Mon 2007-03-05 16:49:51 +1100
    message:
      Fixes for some comparison tests; repr of DirStateRevisionTree
    ------------------------------------------------------------
    revno: 2255.2.183
    merged: mbp at sourcefrog.net-20070305050600-4oib0crvql5oiedd
    parent: mbp at sourcefrog.net-20070305045534-pqrd3x4sy71x6ttw
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: subtree
    timestamp: Mon 2007-03-05 16:06:00 +1100
    message:
      add missing _must_be_locked and a better message
    ------------------------------------------------------------
    revno: 2255.2.182
    merged: mbp at sourcefrog.net-20070305045534-pqrd3x4sy71x6ttw
    parent: mbp at sourcefrog.net-20070305042053-7janauma57nr4kjf
    parent: mbp at sourcefrog.net-20070305041353-o81chijxnnurl2bv
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: subtree
    timestamp: Mon 2007-03-05 15:55:34 +1100
    message:
      merge dirstate and trunk
        ------------------------------------------------------------
        revno: 2255.2.151.1.92.1.6
        merged: mbp at sourcefrog.net-20070305041353-o81chijxnnurl2bv
        parent: mbp at sourcefrog.net-20070305035531-1t1wn6oy526vrb0q
        parent: robertc at robertcollins.net-20070305034356-og43j35eg62m952f
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: dirstate
        timestamp: Mon 2007-03-05 15:13:53 +1100
        message:
          merge dirstate (and trunk)
        ------------------------------------------------------------
        revno: 2255.2.151.1.98
        merged: robertc at robertcollins.net-20070305034356-og43j35eg62m952f
        parent: robertc at robertcollins.net-20070305031021-ypbakvagbivyw5mu
        parent: pqm at pqm.ubuntu.com-20070302224952-1f19efc6c320215f
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Mon 2007-03-05 14:43:56 +1100
        message:
          Merge bzr.dev.
    ------------------------------------------------------------
    revno: 2255.2.181
    merged: mbp at sourcefrog.net-20070305042053-7janauma57nr4kjf
    parent: mbp at sourcefrog.net-20070305041538-x4iybeq8u6tuvscx
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: subtree
    timestamp: Mon 2007-03-05 15:20:53 +1100
    message:
      test_nested_merge must hold lock while looking at inventory
    ------------------------------------------------------------
    revno: 2255.2.180
    merged: mbp at sourcefrog.net-20070305041538-x4iybeq8u6tuvscx
    parent: mbp at sourcefrog.net-20070305035848-xs1fgcwovuthekyq
    parent: mbp at sourcefrog.net-20070305035531-1t1wn6oy526vrb0q
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: subtree
    timestamp: Mon 2007-03-05 15:15:38 +1100
    message:
      merge dirstate
        ------------------------------------------------------------
        revno: 2255.2.151.1.92.1.5
        merged: mbp at sourcefrog.net-20070305035531-1t1wn6oy526vrb0q
        parent: mbp at sourcefrog.net-20070305034510-w28mfl0bv7qxlbvo
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: dirstate
        timestamp: Mon 2007-03-05 14:55:31 +1100
        message:
          Tree.id2path should raise NoSuchId, not return None.
          
          Add tree implementation test for this and update WorkingTree_4.
        ------------------------------------------------------------
        revno: 2255.2.151.1.92.1.4
        merged: mbp at sourcefrog.net-20070305034510-w28mfl0bv7qxlbvo
        parent: mbp at sourcefrog.net-20070305033420-xsiqka8sl08lb0q6
        parent: robertc at robertcollins.net-20070305031021-ypbakvagbivyw5mu
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: dirstate
        timestamp: Mon 2007-03-05 14:45:10 +1100
        message:
          merge dirstate
            ------------------------------------------------------------
            revno: 2255.2.151.1.97
            merged: robertc at robertcollins.net-20070305031021-ypbakvagbivyw5mu
            parent: robertc at robertcollins.net-20070305011525-fakb9irlbxyxaukb
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: dirstate
            timestamp: Mon 2007-03-05 14:10:21 +1100
            message:
              Teach delta.report_changes about unversioned files, removing all inventory access during status --short.
            ------------------------------------------------------------
            revno: 2255.2.151.1.96
            merged: robertc at robertcollins.net-20070305011525-fakb9irlbxyxaukb
            parent: robertc at robertcollins.net-20070304221043-gxthr6yo2w4yy6mx
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: dirstate
            timestamp: Mon 2007-03-05 12:15:25 +1100
            message:
              Change _iter_changes interface to yield both old and new paths.
            ------------------------------------------------------------
            revno: 2255.2.151.1.95
            merged: robertc at robertcollins.net-20070304221043-gxthr6yo2w4yy6mx
            parent: mbp at sourcefrog.net-20070304080909-xjsidexprse2bar5
            committer: Robert Collins <robertc at robertcollins.net>
            branch nick: dirstate
            timestamp: Mon 2007-03-05 09:10:43 +1100
            message:
              Add convenience utf8 decode routine for handling strings that might be None
        ------------------------------------------------------------
        revno: 2255.2.151.1.92.1.3
        merged: mbp at sourcefrog.net-20070305033420-xsiqka8sl08lb0q6
        parent: mbp at sourcefrog.net-20070303022125-m66a0pccahokfj2k
        parent: mbp at sourcefrog.net-20070304080909-xjsidexprse2bar5
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: dirstate
        timestamp: Mon 2007-03-05 14:34:20 +1100
        message:
          cherrypick support for tree-references in dirstate
        ------------------------------------------------------------
        revno: 2255.2.151.1.92.1.2
        merged: mbp at sourcefrog.net-20070303022125-m66a0pccahokfj2k
        parent: mbp at sourcefrog.net-20070303014729-27moafq7ozd00101
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: dirstate
        timestamp: Sat 2007-03-03 13:21:25 +1100
        message:
          Add more dirstate root-id-changing tests
        ------------------------------------------------------------
        revno: 2255.2.151.1.92.1.1
        merged: mbp at sourcefrog.net-20070303014729-27moafq7ozd00101
        parent: mbp at sourcefrog.net-20070302075754-mc4x24a06swkc6f2
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: dirstate
        timestamp: Sat 2007-03-03 12:47:29 +1100
        message:
          fix missing import
    ------------------------------------------------------------
    revno: 2255.2.179
    merged: mbp at sourcefrog.net-20070305035848-xs1fgcwovuthekyq
    parent: mbp at sourcefrog.net-20070305005222-udndz0dnl2vorbpi
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: subtree
    timestamp: Mon 2007-03-05 14:58:48 +1100
    message:
      enhanced set_path_id_with_parents test
    ------------------------------------------------------------
    revno: 2255.2.178
    merged: mbp at sourcefrog.net-20070305005222-udndz0dnl2vorbpi
    parent: mbp at sourcefrog.net-20070305004001-tyu9v25z44f1a2e8
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Mon 2007-03-05 11:52:22 +1100
    message:
      test_set_path_id_with_parents shouldn't depend on tree default root id
    ------------------------------------------------------------
    revno: 2255.2.177
    merged: mbp at sourcefrog.net-20070305004001-tyu9v25z44f1a2e8
    parent: mbp at sourcefrog.net-20070304053725-6pawqsvzge6fgvpy
    parent: mbp at sourcefrog.net-20070304080909-xjsidexprse2bar5
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Mon 2007-03-05 11:40:01 +1100
    message:
      merge dirstate sorting fix, add more validation tests
        ------------------------------------------------------------
        revno: 2255.2.151.1.94
        merged: mbp at sourcefrog.net-20070304080909-xjsidexprse2bar5
        parent: mbp at sourcefrog.net-20070304051109-r2yzx82ncucuwiqj
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: dirstate
        timestamp: Sun 2007-03-04 19:09:09 +1100
        message:
          Fix dirstate sorting bug and refine the _validate() assertions: 
          
          In this format the dirblocks are sorted by directory treated as a series
          of components, validate needs to be updated to take that into account.
          
          When there are multiple entries at the same path they are be sorted by id.
          Add a test for this.
    ------------------------------------------------------------
    revno: 2255.2.176
    merged: mbp at sourcefrog.net-20070304053725-6pawqsvzge6fgvpy
    parent: mbp at sourcefrog.net-20070303014813-fs0ojs875xo3ng8o
    parent: mbp at sourcefrog.net-20070304051109-r2yzx82ncucuwiqj
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Sun 2007-03-04 16:37:25 +1100
    message:
      Merge dirstate and some small cleanups
        ------------------------------------------------------------
        revno: 2255.2.151.1.93
        merged: mbp at sourcefrog.net-20070304051109-r2yzx82ncucuwiqj
        parent: mbp at sourcefrog.net-20070302075754-mc4x24a06swkc6f2
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: dirstate
        timestamp: Sun 2007-03-04 16:11:09 +1100
        message:
          Add support for tree-references in dirstate
    ------------------------------------------------------------
    revno: 2255.2.175
    merged: mbp at sourcefrog.net-20070303014813-fs0ojs875xo3ng8o
    parent: mbp at sourcefrog.net-20070302094441-8gupjnz50wivvmj8
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Sat 2007-03-03 12:48:13 +1100
    message:
      fix missing import
    ------------------------------------------------------------
    revno: 2255.2.174
    merged: mbp at sourcefrog.net-20070302094441-8gupjnz50wivvmj8
    parent: mbp at sourcefrog.net-20070302092757-gjmoq58z9setp7kp
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Fri 2007-03-02 20:44:41 +1100
    message:
      remove AB1 WorkingTree and experimental-knit3
    ------------------------------------------------------------
    revno: 2255.2.173
    merged: mbp at sourcefrog.net-20070302092757-gjmoq58z9setp7kp
    parent: mbp at sourcefrog.net-20070302091457-r8xcdqoyesxfuijs
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Fri 2007-03-02 20:27:57 +1100
    message:
      Set default wt to 4, as in dirstate branch
    ------------------------------------------------------------
    revno: 2255.2.172
    merged: mbp at sourcefrog.net-20070302091457-r8xcdqoyesxfuijs
    parent: mbp at sourcefrog.net-20070302085638-pr8pa43gffwig209
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Fri 2007-03-02 20:14:57 +1100
    message:
      Recognize 't' (tree-reference) minikind in DirState._get_entry
    ------------------------------------------------------------
    revno: 2255.2.171
    merged: mbp at sourcefrog.net-20070302085638-pr8pa43gffwig209
    parent: mbp at sourcefrog.net-20070302085516-0yyuvauummgcycsm
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Fri 2007-03-02 19:56:38 +1100
    message:
      Fix up blackbox test_add to avoid depending on inventory not being held in memory
    ------------------------------------------------------------
    revno: 2255.2.170
    merged: mbp at sourcefrog.net-20070302085516-0yyuvauummgcycsm
    parent: mbp at sourcefrog.net-20070301122840-6exf6ilcew2mcn1g
    parent: mbp at sourcefrog.net-20070302075754-mc4x24a06swkc6f2
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Fri 2007-03-02 19:55:16 +1100
    message:
      merge dirstate
        ------------------------------------------------------------
        revno: 2255.2.151.1.92
        merged: mbp at sourcefrog.net-20070302075754-mc4x24a06swkc6f2
        parent: robertc at robertcollins.net-20070302044012-otqrdw1uhxrw3ar7
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: dirstate
        timestamp: Fri 2007-03-02 18:57:54 +1100
        message:
          Test for smart_add(save=false) should be run against all WorkingTrees; adjust the test to more precisely cover the contract.
        ------------------------------------------------------------
        revno: 2255.2.151.1.91
        merged: robertc at robertcollins.net-20070302044012-otqrdw1uhxrw3ar7
        parent: robertc at robertcollins.net-20070302034756-kkqil9dftr9t14sv
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate.dogfood
        timestamp: Fri 2007-03-02 15:40:12 +1100
        message:
          Move unknown detection in long status into the delta creation, saving a tree-scan.
        ------------------------------------------------------------
        revno: 2255.2.151.1.90
        merged: robertc at robertcollins.net-20070302034756-kkqil9dftr9t14sv
        parent: john at arbash-meinel.com-20070302031949-02axv3fix1qfkuqq
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate.dogfood
        timestamp: Fri 2007-03-02 14:47:56 +1100
        message:
          Add unversioned path reporting to TreeDelta.
        ------------------------------------------------------------
        revno: 2255.2.151.1.89
        merged: john at arbash-meinel.com-20070302031949-02axv3fix1qfkuqq
        parent: robertc at robertcollins.net-20070302025830-o4lth4e9hqyq8stx
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 21:19:49 -0600
        message:
          Revert back to base64.encodestring() It seems codes.encoder() is actually a wrapper around encodestring() not the other way around.
        ------------------------------------------------------------
        revno: 2255.2.151.1.88
        merged: robertc at robertcollins.net-20070302025830-o4lth4e9hqyq8stx
        parent: robertc at robertcollins.net-20070302024953-pc6v83lxtj1n22st
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate.dogfood
        timestamp: Fri 2007-03-02 13:58:30 +1100
        message:
          Enable InterTree._iter_changes symlink tests.
        ------------------------------------------------------------
        revno: 2255.2.151.1.87
        merged: robertc at robertcollins.net-20070302024953-pc6v83lxtj1n22st
        parent: john at arbash-meinel.com-20070302023327-t7w84ndc43ik7mn5
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate.dogfood
        timestamp: Fri 2007-03-02 13:49:53 +1100
        message:
          Dont walk unversioned directories in _iter_changes.
        ------------------------------------------------------------
        revno: 2255.2.151.1.86
        merged: john at arbash-meinel.com-20070302023327-t7w84ndc43ik7mn5
        parent: robertc at robertcollins.net-20070302010612-v4zb59puoc5b0ai5
        parent: john at arbash-meinel.com-20070302023056-46dri14s11eipisp
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 20:33:27 -0600
        message:
          Fix tests broken by dirstate caching sha1 and stat values.
          Change _iter_changes so that it call update_entry() at the beginning.
          this gives us a chance to have files change kind, and still get
          the sha1 value from the cache rather than re-reading the file.
          Some small updates for executable bits on win32.
            ------------------------------------------------------------
            revno: 2255.2.151.1.83.1.9
            merged: john at arbash-meinel.com-20070302023056-46dri14s11eipisp
            parent: john at arbash-meinel.com-20070302022258-ugy51gistf13ib0l
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: dirstate-nohc
            timestamp: Thu 2007-03-01 20:30:56 -0600
            message:
              one more test that needs to ignore dirstate
            ------------------------------------------------------------
            revno: 2255.2.151.1.83.1.8
            merged: john at arbash-meinel.com-20070302022258-ugy51gistf13ib0l
            parent: john at arbash-meinel.com-20070302021159-ioaqbmd0ihuqteav
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: dirstate-nohc
            timestamp: Thu 2007-03-01 20:22:58 -0600
            message:
              Fix another tests that was assuming dirstate was identical
              between branches.
            ------------------------------------------------------------
            revno: 2255.2.151.1.83.1.7
            merged: john at arbash-meinel.com-20070302021159-ioaqbmd0ihuqteav
            parent: john at arbash-meinel.com-20070302013806-q40tsj7ohnfz9vj0
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: dirstate-nohc
            timestamp: Thu 2007-03-01 20:11:59 -0600
            message:
              Some updates to how we handle the executable bit. In preparation for supporting Win32
            ------------------------------------------------------------
            revno: 2255.2.151.1.83.1.6
            merged: john at arbash-meinel.com-20070302013806-q40tsj7ohnfz9vj0
            parent: john at arbash-meinel.com-20070302012753-5jwb15csi4j2mi4w
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: dirstate-nohc
            timestamp: Thu 2007-03-01 19:38:06 -0600
            message:
              Save approx 30-60ms (5-10%) on a LP tree by not calling time.time() for every entry.
            ------------------------------------------------------------
            revno: 2255.2.151.1.83.1.5
            merged: john at arbash-meinel.com-20070302012753-5jwb15csi4j2mi4w
            parent: john at arbash-meinel.com-20070302002706-xz1pf69mu3tk9ud8
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: dirstate-nohc
            timestamp: Thu 2007-03-01 19:27:53 -0600
            message:
              Fix a small bug when we have a symlink that does not need to be re-read.
            ------------------------------------------------------------
            revno: 2255.2.151.1.83.1.4
            merged: john at arbash-meinel.com-20070302002706-xz1pf69mu3tk9ud8
            parent: john at arbash-meinel.com-20070302000729-5qybyk0c6aldecpj
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: dirstate-nohc
            timestamp: Thu 2007-03-01 18:27:06 -0600
            message:
              do not update_entry from disk if it is supposed to be absent or renamed
              and make sure to use the current target_details afterwards
              in case something has changed.
            ------------------------------------------------------------
            revno: 2255.2.151.1.83.1.3
            merged: john at arbash-meinel.com-20070302000729-5qybyk0c6aldecpj
            parent: john at arbash-meinel.com-20070301215619-wpt6kz8yem3ypu1b
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: dirstate-nohc
            timestamp: Thu 2007-03-01 18:07:29 -0600
            message:
              (broken) Change get_sha1_for_entry into update_entry
              which reads off of the disk, and updates dirblocks.
              This includes handling when files change into directories, and other
              such content changes.
              For some reason it breaks higher level tests, so for now, I'm
              leaving this as a local commit until I can sort out the rest.
        ------------------------------------------------------------
        revno: 2255.2.151.1.85
        merged: robertc at robertcollins.net-20070302010612-v4zb59puoc5b0ai5
        parent: john at arbash-meinel.com-20070301215930-ivnmomd61iek19bn
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate.dogfood
        timestamp: Fri 2007-03-02 12:06:12 +1100
        message:
          Teach _iter_changes to gather unversioned path details upon request.
        ------------------------------------------------------------
        revno: 2255.2.151.1.84
        merged: john at arbash-meinel.com-20070301215930-ivnmomd61iek19bn
        parent: john at arbash-meinel.com-20070301164850-80ih12xza1edee6i
        parent: john at arbash-meinel.com-20070301215619-wpt6kz8yem3ypu1b
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 15:59:30 -0600
        message:
          [merge] WorkingTree4 no longer uses the HashCache.
          This saves 1-2s on a 'bzr status' in a 55k entry tree.
          Locks are also updated to be non-blocking, and DirState will try to
          write out its contents if it has been changed even if currently
          read-locked, by trying to grab a write lock for the write.
            ------------------------------------------------------------
            revno: 2255.2.151.1.83.1.2
            merged: john at arbash-meinel.com-20070301215619-wpt6kz8yem3ypu1b
            parent: john at arbash-meinel.com-20070301195838-7p053os20qwr6qf7
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: dirstate-nohc
            timestamp: Thu 2007-03-01 15:56:19 -0600
            message:
              Update to dirstate locking.
              Move all of WT4.lock_* functions locally, so that they can
              properly interact and cleanup around when we lock/unlock the
              dirstate file.
              Change all Lock objects to be non-blocking. So that if someone
              grabs a lock on the DirState we find out immediately, rather
              than blocking.
              Change WT4.unlock() so that if the dirstate is dirty, it will
              save the contents even if it only has a read lock.
              It does this by trying to take a write lock, if it fails
              we just ignore it. If it succeeds, then we can flush to disk.
              This is more important now that DirState tracks file changes.
              It allows 'bzr status' to update the cached stat and sha values.
            ------------------------------------------------------------
            revno: 2255.2.151.1.83.1.1
            merged: john at arbash-meinel.com-20070301195838-7p053os20qwr6qf7
            parent: john at arbash-meinel.com-20070301164850-80ih12xza1edee6i
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: dirstate-nohc
            timestamp: Thu 2007-03-01 13:58:38 -0600
            message:
              Update WorkingTree4 so that it doesn't use a HashCache,
              instead caching the sha values and stat fingerprint in the 'current'
              section.
        ------------------------------------------------------------
        revno: 2255.2.151.1.83
        merged: john at arbash-meinel.com-20070301164850-80ih12xza1edee6i
        parent: john at arbash-meinel.com-20070301160638-r3ztz5182jlt0q6q
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 10:48:50 -0600
        message:
          Update some obvious copyright headers to include 2007.
        ------------------------------------------------------------
        revno: 2255.2.151.1.82
        merged: john at arbash-meinel.com-20070301160638-r3ztz5182jlt0q6q
        parent: john at arbash-meinel.com-20070301160133-36cg0te3k4xd9jqk
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 10:06:38 -0600
        message:
          Fix a small typo that causes _iter_changes to break.
        ------------------------------------------------------------
        revno: 2255.2.151.1.81
        merged: john at arbash-meinel.com-20070301160133-36cg0te3k4xd9jqk
        parent: john at arbash-meinel.com-20070301155418-ocyly7icb2tyhvvu
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 10:01:33 -0600
        message:
          Be optimistic about .bzr/branch/revision-history already being in utf8.
          Decoding all 178k revisions for a mozilla tree takes about 3s / 15s for a 'bzr status'.
          Branch6 will do better by caching last_revision rather than the complete history.
          But for now, it looks a lot better if we just assume the revisions are utf8.
        ------------------------------------------------------------
        revno: 2255.2.151.1.80
        merged: john at arbash-meinel.com-20070301155418-ocyly7icb2tyhvvu
        parent: robertc at robertcollins.net-20070301122044-x7c1rh865qdv3pnb
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 09:54:18 -0600
        message:
          Don't decode the path entry until we've actually decided to return the tuple.
          This saves somewhere between 500 - 1000ms on the Moz tree.
          It will be more noticable when we don't do the extra directory walking
          (where we have to decode all of the path names again).
        ------------------------------------------------------------
        revno: 2255.2.151.1.79
        merged: robertc at robertcollins.net-20070301122044-x7c1rh865qdv3pnb
        parent: mbp at sourcefrog.net-20070301120450-umm5g6q0xqqt7296
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate.dogfood
        timestamp: Thu 2007-03-01 23:20:44 +1100
        message:
          Some BRANCH.TODO updates.
    ------------------------------------------------------------
    revno: 2255.2.169
    merged: mbp at sourcefrog.net-20070301122840-6exf6ilcew2mcn1g
    parent: mbp at sourcefrog.net-20070301101403-v2ey2v53rhzprmds
    parent: mbp at sourcefrog.net-20070301112142-blqdo0tmp0loms7y
    parent: mbp at sourcefrog.net-20070301120450-umm5g6q0xqqt7296
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Thu 2007-03-01 23:28:40 +1100
    message:
      (broken) merge dirstate branch
        ------------------------------------------------------------
        revno: 2255.2.151.1.78
        merged: mbp at sourcefrog.net-20070301120450-umm5g6q0xqqt7296
        parent: robertc at robertcollins.net-20070301115646-t40d51cvqsrok6b5
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: dirstate-robert
        timestamp: Thu 2007-03-01 23:04:50 +1100
        message:
          Add DirState._validate and call from the tests
        ------------------------------------------------------------
        revno: 2255.2.151.1.77
        merged: robertc at robertcollins.net-20070301115646-t40d51cvqsrok6b5
        parent: robertc at robertcollins.net-20070301115027-7ch3pnc922va6fr5
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate.dogfood
        timestamp: Thu 2007-03-01 22:56:46 +1100
        message:
          Make test_iter_reverse_revision_history flush the working tree after commit before merging, as merge still does _write_inventory.
        ------------------------------------------------------------
        revno: 2255.2.151.1.76
        merged: robertc at robertcollins.net-20070301115027-7ch3pnc922va6fr5
        parent: mbp at sourcefrog.net-20070301112142-blqdo0tmp0loms7y
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate.dogfood
        timestamp: Thu 2007-03-01 22:50:27 +1100
        message:
          Fix _get_entry, which got broken at some point, this fixes tests now, so it should not be breakable in future.
        ------------------------------------------------------------
        revno: 2255.2.151.1.75
        merged: mbp at sourcefrog.net-20070301112142-blqdo0tmp0loms7y
        parent: robertc at robertcollins.net-20070301111653-xz97hibpktk2y5co
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: dirstate-robert
        timestamp: Thu 2007-03-01 22:21:42 +1100
        message:
          WorkingTree._add only needs to lock the tree - avoids lock reentry error
        ------------------------------------------------------------
        revno: 2255.2.151.1.74
        merged: robertc at robertcollins.net-20070301111653-xz97hibpktk2y5co
        parent: robertc at robertcollins.net-20070301095035-qq2jbr6p4ggdlu1t
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate.dogfood
        timestamp: Thu 2007-03-01 22:16:53 +1100
        message:
          Test adding of roots to trees, it was broken on WorkingTree4.
        ------------------------------------------------------------
        revno: 2255.2.151.1.73
        merged: robertc at robertcollins.net-20070301095035-qq2jbr6p4ggdlu1t
        parent: robertc at robertcollins.net-20070301094642-jjtzsx00wz14j110
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate.dogfood
        timestamp: Thu 2007-03-01 20:50:35 +1100
        message:
          Fix info for the new default format - these tests really need refactoring.
        ------------------------------------------------------------
        revno: 2255.2.151.1.72
        merged: robertc at robertcollins.net-20070301094642-jjtzsx00wz14j110
        parent: robertc at robertcollins.net-20070301093426-yavn95x00rpc5nyb
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate.dogfood
        timestamp: Thu 2007-03-01 20:46:42 +1100
        message:
          Update cmd_deleted to lock around inventory access.
        ------------------------------------------------------------
        revno: 2255.2.151.1.71
        merged: robertc at robertcollins.net-20070301093426-yavn95x00rpc5nyb
        parent: robertc at robertcollins.net-20070301085003-1k4kx7hxz8ce5x8p
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate.dogfood
        timestamp: Thu 2007-03-01 20:34:26 +1100
        message:
          Fix blackbox test_mv usage of inventory, and the errors raised by workingtree4.move - though that should be made into a workingtree conformance test.
    ------------------------------------------------------------
    revno: 2255.2.168
    merged: mbp at sourcefrog.net-20070301101403-v2ey2v53rhzprmds
    parent: mbp at sourcefrog.net-20070301090216-vhh2444yosrvw6ll
    parent: robertc at robertcollins.net-20070301085003-1k4kx7hxz8ce5x8p
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Thu 2007-03-01 21:14:03 +1100
    message:
      merge robert, debugging
        ------------------------------------------------------------
        revno: 2255.2.151.1.70
        merged: robertc at robertcollins.net-20070301085003-1k4kx7hxz8ce5x8p
        parent: robertc at robertcollins.net-20070301084414-h302pw7vt7wllqb6
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 19:50:03 +1100
        message:
          Workaround WorkingTree4 not having a native remove() in test_cat.
        ------------------------------------------------------------
        revno: 2255.2.151.1.69
        merged: robertc at robertcollins.net-20070301084414-h302pw7vt7wllqb6
        parent: mbp at sourcefrog.net-20070301083325-e87nhnnpx3i18nea
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 19:44:14 +1100
        message:
          Fix all blackbox add tests, and the add --from-ids case in the UI.
        ------------------------------------------------------------
        revno: 2255.2.151.1.68
        merged: mbp at sourcefrog.net-20070301083325-e87nhnnpx3i18nea
        parent: robertc at robertcollins.net-20070301080114-dt6xpp7v0envbati
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: dirstate-robert
        timestamp: Thu 2007-03-01 19:33:25 +1100
        message:
          Add a test for setting the root id in a dirstate with parent trees
        ------------------------------------------------------------
        revno: 2255.2.151.1.67
        merged: robertc at robertcollins.net-20070301080114-dt6xpp7v0envbati
        parent: robertc at robertcollins.net-20070301074339-34mc7tfym7o4uugf
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 19:01:14 +1100
        message:
          Fix test_inv - make setting WorkingTree4._dirty use a helper to reduce code duplication, and reset the inventory when we dont manually update it, if it exists.
        ------------------------------------------------------------
        revno: 2255.2.151.1.66
        merged: robertc at robertcollins.net-20070301074339-34mc7tfym7o4uugf
        parent: robertc at robertcollins.net-20070301072736-dc00wtcb7py592re
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 18:43:39 +1100
        message:
          MutableTree.add only needs a tree write lock.
        ------------------------------------------------------------
        revno: 2255.2.151.1.65
        merged: robertc at robertcollins.net-20070301072736-dc00wtcb7py592re
        parent: robertc at robertcollins.net-20070301071122-yhy7vchlazynnb8y
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 18:27:36 +1100
        message:
          Split test_root_revision_entry into tree and repository portions.
        ------------------------------------------------------------
        revno: 2255.2.151.1.64
        merged: robertc at robertcollins.net-20070301071122-yhy7vchlazynnb8y
        parent: robertc at robertcollins.net-20070301065052-d08k4x37bchwo48e
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 18:11:22 +1100
        message:
          Disabled test_repository.test_create_basis_inventory, a test that tests tree behaviour in the wrong place - its future is being discussed.
        ------------------------------------------------------------
        revno: 2255.2.151.1.63
        merged: robertc at robertcollins.net-20070301065052-d08k4x37bchwo48e
        parent: robertc at robertcollins.net-20070301061944-y1jw05ufqdpw4yx5
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 17:50:52 +1100
        message:
          Fix cmd_renames to lock around inventory access.
        ------------------------------------------------------------
        revno: 2255.2.151.1.62
        merged: robertc at robertcollins.net-20070301061944-y1jw05ufqdpw4yx5
        parent: robertc at robertcollins.net-20070301054630-ff4zf6s3odxfic71
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 17:19:44 +1100
        message:
          Update the Tree.filter_unversioned_files docstring to reflect what the existing implementations actually do, and change the WorkingTree4 implementation to match a newly created test for it.
        ------------------------------------------------------------
        revno: 2255.2.151.1.61
        merged: robertc at robertcollins.net-20070301054630-ff4zf6s3odxfic71
        parent: robertc at robertcollins.net-20070301053439-rf8mkppoqutiy7fa
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 16:46:30 +1100
        message:
          Remove exploratory cruft.
        ------------------------------------------------------------
        revno: 2255.2.151.1.60
        merged: robertc at robertcollins.net-20070301053439-rf8mkppoqutiy7fa
        parent: robertc at robertcollins.net-20070301052802-zwbocbr7z5vyptad
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 16:34:39 +1100
        message:
          Make the assertStatus blackbox helper clearer.
        ------------------------------------------------------------
        revno: 2255.2.151.1.59
        merged: robertc at robertcollins.net-20070301052802-zwbocbr7z5vyptad
        parent: robertc at robertcollins.net-20070301052607-x77gnbfssigedky4
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 16:28:02 +1100
        message:
          Remove a break-lock test that was duplicating lower level testing without adding value.
        ------------------------------------------------------------
        revno: 2255.2.151.1.58
        merged: robertc at robertcollins.net-20070301052607-x77gnbfssigedky4
        parent: robertc at robertcollins.net-20070301052056-h3byz7nuk38la3os
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 16:26:07 +1100
        message:
          Fix a blackbox test to not use inventory to determine tree size.
        ------------------------------------------------------------
        revno: 2255.2.151.1.57
        merged: robertc at robertcollins.net-20070301052056-h3byz7nuk38la3os
        parent: robertc at robertcollins.net-20070301051807-3qz6wj0jtjsieyj2
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 16:20:56 +1100
        message:
          Fix test_smart_add tests for dirstate - mainly inventory outside locks issues.
        ------------------------------------------------------------
        revno: 2255.2.151.1.56
        merged: robertc at robertcollins.net-20070301051807-3qz6wj0jtjsieyj2
        parent: robertc at robertcollins.net-20070301050247-ufh99m2ze45d7mol
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 16:18:07 +1100
        message:
          Document behaviour of tree.path2id("path/").
        ------------------------------------------------------------
        revno: 2255.2.151.1.55
        merged: robertc at robertcollins.net-20070301050247-ufh99m2ze45d7mol
        parent: robertc at robertcollins.net-20070301050153-9wdn7gdori263v9e
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 16:02:47 +1100
        message:
          Whitespace fix.
        ------------------------------------------------------------
        revno: 2255.2.151.1.54
        merged: robertc at robertcollins.net-20070301050153-9wdn7gdori263v9e
        parent: robertc at robertcollins.net-20070301050053-u0ac7vavyzplbjz1
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 16:01:53 +1100
        message:
          in test_inv, stop abusing the inventory interface to get tree alterations to occur.
        ------------------------------------------------------------
        revno: 2255.2.151.1.53
        merged: robertc at robertcollins.net-20070301050053-u0ac7vavyzplbjz1
        parent: robertc at robertcollins.net-20070301042839-hgs5fy98vuws6iau
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 16:00:53 +1100
        message:
          Make the dirstate API changes be prominently documented for upgraders.
        ------------------------------------------------------------
        revno: 2255.2.151.1.52
        merged: robertc at robertcollins.net-20070301042839-hgs5fy98vuws6iau
        parent: robertc at robertcollins.net-20070301042042-vmcypp3mjnvuwft5
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 15:28:39 +1100
        message:
          Lock trees in Merge3Merger correctly.
        ------------------------------------------------------------
        revno: 2255.2.151.1.51
        merged: robertc at robertcollins.net-20070301042042-vmcypp3mjnvuwft5
        parent: robertc at robertcollins.net-20070301041307-yendz2ijpubqmfgq
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 15:20:42 +1100
        message:
          Lock build_tree trees in write-first order, to support older formats that dont do lock_tree_write nicely.
        ------------------------------------------------------------
        revno: 2255.2.151.1.50
        merged: robertc at robertcollins.net-20070301041307-yendz2ijpubqmfgq
        parent: robertc at robertcollins.net-20070301040645-1ky0urtukkb9gdxa
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 15:13:07 +1100
        message:
          Remove unguarded call to find_interesting in test_find_interesting - its tested by the actual code that does the work.
        ------------------------------------------------------------
        revno: 2255.2.151.1.49
        merged: robertc at robertcollins.net-20070301040645-1ky0urtukkb9gdxa
        parent: robertc at robertcollins.net-20070301035615-apsvyiyqk6pqext2
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 15:06:45 +1100
        message:
          Lock trees passed in to build_tree.
        ------------------------------------------------------------
        revno: 2255.2.151.1.48
        merged: robertc at robertcollins.net-20070301035615-apsvyiyqk6pqext2
        parent: robertc at robertcollins.net-20070301035205-lfdthhpjoudb07b8
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 14:56:15 +1100
        message:
          Deprecated and make work with DirState trees 'transform.find_interesting'.
        ------------------------------------------------------------
        revno: 2255.2.151.1.47
        merged: robertc at robertcollins.net-20070301035205-lfdthhpjoudb07b8
        parent: robertc at robertcollins.net-20070301032019-s9lbs2lv8xa6zqxk
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 14:52:05 +1100
        message:
          Improve applyDeprecated warning message.
    ------------------------------------------------------------
    revno: 2255.2.167
    merged: mbp at sourcefrog.net-20070301090216-vhh2444yosrvw6ll
    parent: mbp at sourcefrog.net-20070301075656-srwqme1s2d721937
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Thu 2007-03-01 20:02:16 +1100
    message:
      Change WorkingTree4.initialize to only get a random root id if not based on a revisiontree
    ------------------------------------------------------------
    revno: 2255.2.166
    merged: mbp at sourcefrog.net-20070301075656-srwqme1s2d721937
    parent: mbp at sourcefrog.net-20070301055733-a977ktcx75cqtqyb
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Thu 2007-03-01 18:56:56 +1100
    message:
      (broken) Add Tree.get_root_id() & test
      
      Add unique root on WorkingTree4 at construction time and test this: currently
      fails trying to set_path_id when the tree has parents.
    ------------------------------------------------------------
    revno: 2255.2.165
    merged: mbp at sourcefrog.net-20070301055733-a977ktcx75cqtqyb
    parent: mbp at sourcefrog.net-20070301052819-5cbjhypodsf6ebgy
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Thu 2007-03-01 16:57:33 +1100
    message:
      Add AB1 test that new trees get unique root ids
    ------------------------------------------------------------
    revno: 2255.2.164
    merged: mbp at sourcefrog.net-20070301052819-5cbjhypodsf6ebgy
    parent: mbp at sourcefrog.net-20070301040742-5vo1bk19e7bnzquc
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Thu 2007-03-01 16:28:19 +1100
    message:
      Change the default format for some tests from AB1 back to WorkingTreeFormat3
    ------------------------------------------------------------
    revno: 2255.2.163
    merged: mbp at sourcefrog.net-20070301040742-5vo1bk19e7bnzquc
    parent: mbp at sourcefrog.net-20070301034802-8m8jqq0wohyyu17c
    parent: robertc at robertcollins.net-20070301032019-s9lbs2lv8xa6zqxk
    committer: mbp at sourcefrog.net
    branch nick: dirstate-plus-subtree
    timestamp: Thu 2007-03-01 15:07:42 +1100
    message:
      Merge Robert/John's dirstate work
        ------------------------------------------------------------
        revno: 2255.2.151.1.46
        merged: robertc at robertcollins.net-20070301032019-s9lbs2lv8xa6zqxk
        parent: robertc at robertcollins.net-20070301025530-4yx1nlo3ze29bajg
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 14:20:19 +1100
        message:
          Fix WorkingTree4.move to return the moved paths, and update the tree implementation tests for move to check them.
        ------------------------------------------------------------
        revno: 2255.2.151.1.45
        merged: robertc at robertcollins.net-20070301025530-4yx1nlo3ze29bajg
        parent: robertc at robertcollins.net-20070301023547-g7w3o81gwczes50y
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 13:55:30 +1100
        message:
          Handle the source and target paths both being relocated from another path in the tree - this is possible with a pending merge.
        ------------------------------------------------------------
        revno: 2255.2.151.1.44
        merged: robertc at robertcollins.net-20070301023547-g7w3o81gwczes50y
        parent: robertc at robertcollins.net-20070301020403-xxmzwvejmkeiimkm
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 13:35:47 +1100
        message:
          Lock the working tree while pulling to work around _iter_changes not supplying the old path, and dirstate not allowing unlocked inventory access.
        ------------------------------------------------------------
        revno: 2255.2.151.1.43
        merged: robertc at robertcollins.net-20070301020403-xxmzwvejmkeiimkm
        parent: robertc at robertcollins.net-20070301020131-1ft93vppfz275x0p
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 13:04:03 +1100
        message:
          Fix fileid_involved tests to not access inventories when not needed.
        ------------------------------------------------------------
        revno: 2255.2.151.1.42
        merged: robertc at robertcollins.net-20070301020131-1ft93vppfz275x0p
        parent: john at arbash-meinel.com-20070301015628-3qy7ndtsui6ya4ix
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 13:01:31 +1100
        message:
          WorkingTree4 only needs a tree write lock during initialize, not a deep write lock.
        ------------------------------------------------------------
        revno: 2255.2.151.1.41
        merged: john at arbash-meinel.com-20070301015628-3qy7ndtsui6ya4ix
        parent: robertc at robertcollins.net-20070301015005-ydqud90417giqbhg
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Wed 2007-02-28 19:56:28 -0600
        message:
          WorkingTree.unversion() should not raise if unversioning a child and a parent.
          Also switch all calls to os.path.join() over to osutils.pathjoin() for correctness
          on win32.
        ------------------------------------------------------------
        revno: 2255.2.151.1.40
        merged: robertc at robertcollins.net-20070301015005-ydqud90417giqbhg
        parent: robertc at robertcollins.net-20070301013354-y4tv9zwh2s8djge7
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 12:50:05 +1100
        message:
          Tweak pathjoin to be correct in its assertion about parameter types.
        ------------------------------------------------------------
        revno: 2255.2.151.1.39
        merged: robertc at robertcollins.net-20070301013354-y4tv9zwh2s8djge7
        parent: john at arbash-meinel.com-20070301010753-ga844l1djraerga7
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 12:33:54 +1100
        message:
          Remove gratuitous references to inventory.path2id from builtins.py, allowing more commands to work on dirstate trees.
        ------------------------------------------------------------
        revno: 2255.2.151.1.38
        merged: john at arbash-meinel.com-20070301010753-ga844l1djraerga7
        parent: robertc at robertcollins.net-20070301010230-fh8p34iloqh7ua5j
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Wed 2007-02-28 19:07:53 -0600
        message:
          show_diff_trees() should lock any extra trees it is passed.
        ------------------------------------------------------------
        revno: 2255.2.151.1.37
        merged: robertc at robertcollins.net-20070301010230-fh8p34iloqh7ua5j
        parent: john at arbash-meinel.com-20070301004745-2hwuavq5wgmi2idi
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Thu 2007-03-01 12:02:30 +1100
        message:
          Dont use a basis tree that is not in the tree's parents for revert testing - its not guaranteed usable.
        ------------------------------------------------------------
        revno: 2255.2.151.1.36
        merged: john at arbash-meinel.com-20070301004745-2hwuavq5wgmi2idi
        parent: john at arbash-meinel.com-20070228233639-kt8judz9w3x27ve4
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Wed 2007-02-28 18:47:45 -0600
        message:
          All trees should implement get_file_mtime()
    ------------------------------------------------------------
    revno: 2255.2.162
    merged: mbp at sourcefrog.net-20070301034802-8m8jqq0wohyyu17c
    parent: mbp at sourcefrog.net-20070301034456-ck62y1icsmsp1a8n
    parent: mbp at sourcefrog.net-20070227061158-thegg4xka7257q8f
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Thu 2007-03-01 14:48:02 +1100
    message:
      compare_subtrees skips formats that can't do subtrees
        ------------------------------------------------------------
        revno: 2255.2.160.1.2
        merged: mbp at sourcefrog.net-20070227061158-thegg4xka7257q8f
        parent: mbp at sourcefrog.net-20070227060323-142rxg5dq06h0w8l
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: dirstate-plus-subtree
        timestamp: Tue 2007-02-27 17:11:58 +1100
        message:
          test_compare_subtrees runs against all trees that claim to support
          references, rather than hardcoding WorkingTree4.
        ------------------------------------------------------------
        revno: 2255.2.160.1.1
        merged: mbp at sourcefrog.net-20070227060323-142rxg5dq06h0w8l
        parent: mbp at sourcefrog.net-20070227055136-6y8ueffopkd59lzf
        committer: Martin Pool <mbp at sourcefrog.net>
        branch nick: dirstate-plus-subtree
        timestamp: Tue 2007-02-27 17:03:23 +1100
        message:
          Remove outdated inventory doctest
    ------------------------------------------------------------
    revno: 2255.2.161
    merged: mbp at sourcefrog.net-20070301034456-ck62y1icsmsp1a8n
    parent: mbp at sourcefrog.net-20070227055136-6y8ueffopkd59lzf
    parent: john at arbash-meinel.com-20070228233639-kt8judz9w3x27ve4
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Thu 2007-03-01 14:44:56 +1100
    message:
      merge some of dirstate, update comparison tests to keep tree roots the same unless they're meant to differ
        ------------------------------------------------------------
        revno: 2255.2.151.1.35
        merged: john at arbash-meinel.com-20070228233639-kt8judz9w3x27ve4
        parent: john at arbash-meinel.com-20070228224054-11e83q8puulllfuh
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Wed 2007-02-28 17:36:39 -0600
        message:
          Handle the case when a directory has been removed, and isn't the last entry.
        ------------------------------------------------------------
        revno: 2255.2.151.1.34
        merged: john at arbash-meinel.com-20070228224054-11e83q8puulllfuh
        parent: john at arbash-meinel.com-20070228221101-c3szee94o5h3uvt7
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Wed 2007-02-28 16:40:54 -0600
        message:
          Clean up test_bad_files, and fix a bug in _iter_changes when
          we get to an unknown file.
        ------------------------------------------------------------
        revno: 2255.2.151.1.33
        merged: john at arbash-meinel.com-20070228221101-c3szee94o5h3uvt7
        parent: john at arbash-meinel.com-20070228215011-hfmfc13mswbubn18
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Wed 2007-02-28 16:11:01 -0600
        message:
          More inner loop tuning of walkdirs, can save as much as 5%
          (drops time on LP tree from 100-105ms, to 95-100ms)
          Also, unify all walkdirs variants to have minimal variation.
        ------------------------------------------------------------
        revno: 2255.2.151.1.32
        merged: john at arbash-meinel.com-20070228215011-hfmfc13mswbubn18
        parent: john at arbash-meinel.com-20070228203936-skucbq8g04qutc2p
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Wed 2007-02-28 15:50:11 -0600
        message:
          Add tests that the walkdirs variants work on unicode paths.
        ------------------------------------------------------------
        revno: 2255.2.151.1.31
        merged: john at arbash-meinel.com-20070228203936-skucbq8g04qutc2p
        parent: john at arbash-meinel.com-20070228203208-tgsw917qz1xresjx
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Wed 2007-02-28 14:39:36 -0600
        message:
          Minor cleanup.
          rather than indexing a tuple all the time, save it as source/target_minikind
          use the cached decoder rather than looking it up all the time
          drops 'bzr status' on lp tree from 1.34s => 1.2s
        ------------------------------------------------------------
        revno: 2255.2.151.1.30
        merged: john at arbash-meinel.com-20070228203208-tgsw917qz1xresjx
        parent: john at arbash-meinel.com-20070228193528-nvb31ekrgk046cv2
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Wed 2007-02-28 14:32:08 -0600
        message:
          Don't cache the parent entry for root, since it is different than all other entries.
        ------------------------------------------------------------
        revno: 2255.2.151.1.29
        merged: john at arbash-meinel.com-20070228193528-nvb31ekrgk046cv2
        parent: john at arbash-meinel.com-20070228192244-uknltx7urh1mur2o
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Wed 2007-02-28 13:35:28 -0600
        message:
          approx 300ms of 'time bzr status' in lp tree by caching last parent info
        ------------------------------------------------------------
        revno: 2255.2.151.1.28
        merged: john at arbash-meinel.com-20070228192244-uknltx7urh1mur2o
        parent: john at arbash-meinel.com-20070228181300-3hpf53zdxpz16bjg
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Wed 2007-02-28 13:22:44 -0600
        message:
          shave about 10% of the time by switching to _walkdirs_utf8
        ------------------------------------------------------------
        revno: 2255.2.151.1.27
        merged: john at arbash-meinel.com-20070228181300-3hpf53zdxpz16bjg
        parent: john at arbash-meinel.com-20070228165719-3q5bxnad9klg5tzz
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Wed 2007-02-28 12:13:00 -0600
        message:
          Add a _walkdirs_utf8 which returns utf8 paths instead of Unicode. Approx 20% faster in walking utf8 filesystems
        ------------------------------------------------------------
        revno: 2255.2.151.1.26
        merged: john at arbash-meinel.com-20070228165719-3q5bxnad9klg5tzz
        parent: john at arbash-meinel.com-20070228160032-nt148nm9c1rrhopj
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Wed 2007-02-28 10:57:19 -0600
        message:
          correct the docstring for walkdirs.
        ------------------------------------------------------------
        revno: 2255.2.151.1.25
        merged: john at arbash-meinel.com-20070228160032-nt148nm9c1rrhopj
        parent: john at arbash-meinel.com-20070228154412-3pwfza0d3839qpsg
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Wed 2007-02-28 10:00:32 -0600
        message:
          Shave off 200+ ms of 'time bzr status' in lp tree
          We don't need to look up source and target parents of an entry if
          we know it hasn't moved, and we already have one, then we have the other.
        ------------------------------------------------------------
        revno: 2255.2.151.1.24
        merged: john at arbash-meinel.com-20070228154412-3pwfza0d3839qpsg
        parent: john at arbash-meinel.com-20070228154101-ht3tfhe0s7d5k3ds
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Wed 2007-02-28 09:44:12 -0600
        message:
          Rework cmd_inventory so that it uses paths2ids and locks the trees for read.
        ------------------------------------------------------------
        revno: 2255.2.151.1.23
        merged: john at arbash-meinel.com-20070228154101-ht3tfhe0s7d5k3ds
        parent: john at arbash-meinel.com-20070227220753-bdvb7lo8fu5yhqg9
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Wed 2007-02-28 09:41:01 -0600
        message:
          remove out-dated doc test in inventory
        ------------------------------------------------------------
        revno: 2255.2.151.1.22
        merged: john at arbash-meinel.com-20070227220753-bdvb7lo8fu5yhqg9
        parent: john at arbash-meinel.com-20070227213216-a6kogwpq49j6dgpm
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Tue 2007-02-27 16:07:53 -0600
        message:
          add a test that shows _iter_changes works when only contents have changed, and nothing is considered newly added.
        ------------------------------------------------------------
        revno: 2255.2.151.1.21
        merged: john at arbash-meinel.com-20070227213216-a6kogwpq49j6dgpm
        parent: john at arbash-meinel.com-20070227030928-bkhmkqvf3mbymqge
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Tue 2007-02-27 15:32:16 -0600
        message:
          Get iter_changes working again, by fixing set_parent_trees to
          create trees with the correct block order.
    ------------------------------------------------------------
    revno: 2255.2.160
    merged: mbp at sourcefrog.net-20070227055136-6y8ueffopkd59lzf
    parent: mbp at sourcefrog.net-20070226144759-5xfdve14d83esg7u
    parent: john at arbash-meinel.com-20070227030928-bkhmkqvf3mbymqge
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Tue 2007-02-27 16:51:36 +1100
    message:
      (merge) updates from dirstate branch
        ------------------------------------------------------------
        revno: 2255.2.151.1.20
        merged: john at arbash-meinel.com-20070227030928-bkhmkqvf3mbymqge
        parent: john at arbash-meinel.com-20070227024845-khpbdijt1an20aso
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Mon 2007-02-26 21:09:28 -0600
        message:
          update test for format 3, and enable caching of path split while lock is held.
        ------------------------------------------------------------
        revno: 2255.2.151.1.19
        merged: john at arbash-meinel.com-20070227024845-khpbdijt1an20aso
        parent: john at arbash-meinel.com-20070227024458-qehj0qcykr3zqckm
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Mon 2007-02-26 20:48:45 -0600
        message:
          disable the new test for now, since it triggers a pdb trace and hangs the test suite.
        ------------------------------------------------------------
        revno: 2255.2.151.1.18
        merged: john at arbash-meinel.com-20070227024458-qehj0qcykr3zqckm
        parent: john at arbash-meinel.com-20070226221107-q3sz1brqz1yxugos
        parent: john at arbash-meinel.com-20070227015806-z9bf0at2itqkc2h0
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Mon 2007-02-26 20:44:58 -0600
        message:
          Change the sort order to match walkdirs() and iter_entries_by_dir()
            ------------------------------------------------------------
            revno: 2255.2.151.1.17.1.6
            merged: john at arbash-meinel.com-20070227015806-z9bf0at2itqkc2h0
            parent: john at arbash-meinel.com-20070227013027-tuqcr879a36obvx3
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: dirstate
            timestamp: Mon 2007-02-26 19:58:06 -0600
            message:
              Because the disk format (sorting) has now changed
              bump the format number. Converting between them is trivial, and
              could actually be done on the fly if desired.
            ------------------------------------------------------------
            revno: 2255.2.151.1.17.1.5
            merged: john at arbash-meinel.com-20070227013027-tuqcr879a36obvx3
            parent: john at arbash-meinel.com-20070227010804-nb6bg1c5fvs2nsri
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: dirstate
            timestamp: Mon 2007-02-26 19:30:27 -0600
            message:
              Add a test that dirstate adds records in the right order.
            ------------------------------------------------------------
            revno: 2255.2.151.1.17.1.4
            merged: john at arbash-meinel.com-20070227010804-nb6bg1c5fvs2nsri
            parent: john at arbash-meinel.com-20070227004109-o0rc0nwaqjzxaved
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: dirstate
            timestamp: Mon 2007-02-26 19:08:04 -0600
            message:
              Rather than using split hunks, implement a bisect_dirblocks
              which knows that it is bisecting dirblocks and only compares the first
              hunk, and does the comparison in split mode.
            ------------------------------------------------------------
            revno: 2255.2.151.1.17.1.3
            merged: john at arbash-meinel.com-20070227004109-o0rc0nwaqjzxaved
            parent: john at arbash-meinel.com-20070227003412-6i0cl98a6f3l71ue
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: dirstate
            timestamp: Mon 2007-02-26 18:41:09 -0600
            message:
              Add the ability to cache the split output
              rather than having to always split paths.
            ------------------------------------------------------------
            revno: 2255.2.151.1.17.1.2
            merged: john at arbash-meinel.com-20070227003412-6i0cl98a6f3l71ue
            parent: john at arbash-meinel.com-20070226230506-8l3jxhu3ed4ruiek
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: dirstate
            timestamp: Mon 2007-02-26 18:34:12 -0600
            message:
              Add a helper function, which allows us to store keys as plain paths,
              but bisect across them as split paths.
            ------------------------------------------------------------
            revno: 2255.2.151.1.17.1.1
            merged: john at arbash-meinel.com-20070226230506-8l3jxhu3ed4ruiek
            parent: john at arbash-meinel.com-20070226221107-q3sz1brqz1yxugos
            committer: John Arbash Meinel <john at arbash-meinel.com>
            branch nick: dirstate
            timestamp: Mon 2007-02-26 17:05:06 -0600
            message:
              (broken) Update the test to actually expose the iter_changes bug.
        ------------------------------------------------------------
        revno: 2255.2.151.1.17
        merged: john at arbash-meinel.com-20070226221107-q3sz1brqz1yxugos
        parent: john at arbash-meinel.com-20070226220814-i6a95mlsdsv3yrf8
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Mon 2007-02-26 16:11:07 -0600
        message:
          Add another test that makes sure we can add as long as the file_id isn't current.
        ------------------------------------------------------------
        revno: 2255.2.151.1.16
        merged: john at arbash-meinel.com-20070226220814-i6a95mlsdsv3yrf8
        parent: john at arbash-meinel.com-20070226215104-1bv5mq6ac140jc15
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Mon 2007-02-26 16:08:14 -0600
        message:
          Make sure adding a duplicate file_id raises DuplicateFileId.
          This adds an explicit test for it, updates Inventory to raise the right error,
          and updates Dirstate.add() to also check for a duplicated file_id.
        ------------------------------------------------------------
        revno: 2255.2.151.1.15
        merged: john at arbash-meinel.com-20070226215104-1bv5mq6ac140jc15
        parent: john at arbash-meinel.com-20070226211703-hqcam97hrxohk5jc
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Mon 2007-02-26 15:51:04 -0600
        message:
          Try to create an intertree test that exposes the walkdir vs dirstate mismatch. No luck yet.
        ------------------------------------------------------------
        revno: 2255.2.151.1.14
        merged: john at arbash-meinel.com-20070226211703-hqcam97hrxohk5jc
        parent: john at arbash-meinel.com-20070226191858-04chtw4qy4a1p3tz
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Mon 2007-02-26 15:17:03 -0600
        message:
          Make set_root_id() a no-op if the id doesn't change,
          and change the test_merge_core tests to flush the state to disk, since
          they are hanging onto a write lock.
        ------------------------------------------------------------
        revno: 2255.2.151.1.13
        merged: john at arbash-meinel.com-20070226191858-04chtw4qy4a1p3tz
        parent: john at arbash-meinel.com-20070226170938-ik5w1cd0a1tuzsgq
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Mon 2007-02-26 13:18:58 -0600
        message:
          find an edge case in our _get_entry logic and fix it.
          Also, id2path doesn't need to grab the index, just use _get_entry.
        ------------------------------------------------------------
        revno: 2255.2.151.1.12
        merged: john at arbash-meinel.com-20070226170938-ik5w1cd0a1tuzsgq
        parent: john at arbash-meinel.com-20070226165924-sqwmymf6drv66yjg
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Mon 2007-02-26 11:09:38 -0600
        message:
          Some comments on merge code, fix merge tests that
          assume basis_tree() is valid after the tree has been modified.
        ------------------------------------------------------------
        revno: 2255.2.151.1.11
        merged: john at arbash-meinel.com-20070226165924-sqwmymf6drv66yjg
        parent: john at arbash-meinel.com-20070226165316-2zipahl3tlihiij9
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Mon 2007-02-26 10:59:24 -0600
        message:
          Avoid directly accessing tree.inventory in merge.py
        ------------------------------------------------------------
        revno: 2255.2.151.1.10
        merged: john at arbash-meinel.com-20070226165316-2zipahl3tlihiij9
        parent: john at arbash-meinel.com-20070226161902-onqljoh62n5r80gh
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Mon 2007-02-26 10:53:16 -0600
        message:
          Handle the case when we are adding a file to an empty directory.
          Add a suite of tests for WorkingTree.add()
        ------------------------------------------------------------
        revno: 2255.2.151.1.9
        merged: john at arbash-meinel.com-20070226161902-onqljoh62n5r80gh
        parent: john at arbash-meinel.com-20070226152717-3so5kz4v7wz7dmpk
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Mon 2007-02-26 10:19:02 -0600
        message:
          Add more tests for WorkingTree.move() and a similar suite
          for WorkingTree.rename_one().
        ------------------------------------------------------------
        revno: 2255.2.151.1.8
        merged: john at arbash-meinel.com-20070226152717-3so5kz4v7wz7dmpk
        parent: robertc at robertcollins.net-20070226055444-qozx06g4s1749uky
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Mon 2007-02-26 09:27:17 -0600
        message:
          Lock the tree when using a commit builder.
        ------------------------------------------------------------
        revno: 2255.2.151.1.7
        merged: robertc at robertcollins.net-20070226055444-qozx06g4s1749uky
        parent: robertc at robertcollins.net-20070226051405-y0p0nx2g03idj2m2
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Mon 2007-02-26 16:54:44 +1100
        message:
          continue iteration at the right point for InterDirStateTree._iter_changes.
        ------------------------------------------------------------
        revno: 2255.2.151.1.6
        merged: robertc at robertcollins.net-20070226051405-y0p0nx2g03idj2m2
        parent: robertc at robertcollins.net-20070226045423-h5irpxqoukh50bjd
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Mon 2007-02-26 16:14:05 +1100
        message:
          Test for iterating changes past empty directories.
        ------------------------------------------------------------
        revno: 2255.2.151.1.5
        merged: robertc at robertcollins.net-20070226045423-h5irpxqoukh50bjd
        parent: robertc at robertcollins.net-20070226042755-e21ce5f15vz94wyr
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Mon 2007-02-26 15:54:23 +1100
        message:
          Back out changing default format: its not ready yet.
        ------------------------------------------------------------
        revno: 2255.2.151.1.4
        merged: robertc at robertcollins.net-20070226042755-e21ce5f15vz94wyr
        parent: robertc at robertcollins.net-20070226035330-h52h54murds6wmpi
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Mon 2007-02-26 15:27:55 +1100
        message:
          Test InterTree._iter_changes with missing (absent but versioned) files.
        ------------------------------------------------------------
        revno: 2255.2.151.1.3
        merged: robertc at robertcollins.net-20070226035330-h52h54murds6wmpi
        parent: robertc at robertcollins.net-20070226021929-4t98ucfojjx6udtr
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Mon 2007-02-26 14:53:30 +1100
        message:
          Add tests for _iter_changes with symlinks, disabled until unversioned file support is added, as that affects the test expected value.
        ------------------------------------------------------------
        revno: 2255.2.151.1.2
        merged: robertc at robertcollins.net-20070226021929-4t98ucfojjx6udtr
        parent: john at arbash-meinel.com-20070226021126-m31pb4ci3lxrjha8
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: dirstate
        timestamp: Mon 2007-02-26 13:19:29 +1100
        message:
          Add a (currently) disabled test for unversioned paths in the target tree with _iter_changes.
        ------------------------------------------------------------
        revno: 2255.2.151.1.1
        merged: john at arbash-meinel.com-20070226021126-m31pb4ci3lxrjha8
        parent: robertc at robertcollins.net-20070226013238-w7sjnnn1d7uvcpg5
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Sun 2007-02-25 20:11:26 -0600
        message:
          _iter_changes should return Unicode paths.
          Also, support NULL_REVISION by special casing the source_index
          and just stating that all entries are absent.
    ------------------------------------------------------------
    revno: 2255.2.159
    merged: mbp at sourcefrog.net-20070226144759-5xfdve14d83esg7u
    parent: mbp at sourcefrog.net-20070226142446-sfvznepsaggqnril
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Tue 2007-02-27 01:47:59 +1100
    message:
      reference-trees in dirstate pass all tests.
      
      _iter_changes crudely changed not to be an iterator, so it can hold the
      lock for the whole time.
      
      Add DirStateRevisionTree.kind()
    ------------------------------------------------------------
    revno: 2255.2.158
    merged: mbp at sourcefrog.net-20070226142446-sfvznepsaggqnril
    parent: mbp at sourcefrog.net-20070226044445-g0o7a0u9qypajqv2
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate-plus-subtree
    timestamp: Tue 2007-02-27 01:24:46 +1100
    message:
      Most of the integration of dirstate and subtree
    ------------------------------------------------------------
    revno: 2255.2.157
    merged: mbp at sourcefrog.net-20070226044445-g0o7a0u9qypajqv2
    parent: mbp at sourcefrog.net-20070226033932-c8fp56jfjksinn2z
    parent: mbp at sourcefrog.net-20070226044016-hp3hp0yitdt7krph
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-26 15:44:45 +1100
    message:
      merge merge_modified test and cleanups
    ------------------------------------------------------------
    revno: 2255.2.156
    merged: mbp at sourcefrog.net-20070226033932-c8fp56jfjksinn2z
    parent: mbp at sourcefrog.net-20070226032255-z0w592rrwil1xtqm
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-26 14:39:32 +1100
    message:
      Merge WorkingTree implementation back from trunk
    ------------------------------------------------------------
    revno: 2255.2.155
    merged: mbp at sourcefrog.net-20070226032255-z0w592rrwil1xtqm
    parent: mbp at sourcefrog.net-20070226031951-yd7bashmx3mjkmep
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-26 14:22:55 +1100
    message:
      Better assertion message from InterDirStateTree._iter_changes
    ------------------------------------------------------------
    revno: 2255.2.154
    merged: mbp at sourcefrog.net-20070226031951-yd7bashmx3mjkmep
    parent: mbp at sourcefrog.net-20070226031310-7alk7pvlb8fg0asn
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-26 14:19:51 +1100
    message:
      Better assertion message from InterDirStateTree._iter_changes
    ------------------------------------------------------------
    revno: 2255.2.153
    merged: mbp at sourcefrog.net-20070226031310-7alk7pvlb8fg0asn
    parent: mbp at sourcefrog.net-20070226025624-4cfvc1r2it0oxxt2
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-26 14:13:10 +1100
    message:
      Add get_symlink_target in base WorkingTree
    ------------------------------------------------------------
    revno: 2255.2.152
    merged: mbp at sourcefrog.net-20070226025624-4cfvc1r2it0oxxt2
    parent: robertc at robertcollins.net-20070226013238-w7sjnnn1d7uvcpg5
    parent: aaron.bentley at utoronto.ca-20070225153342-1ezvd6nf72f7na8k
    committer: Martin Pool <mbp at sourcefrog.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-26 13:56:24 +1100
    message:
      (broken) merge aaron's workingtree format changes
        ------------------------------------------------------------
        revno: 2255.2.104.1.9
        merged: aaron.bentley at utoronto.ca-20070225153342-1ezvd6nf72f7na8k
        parent: aaron.bentley at utoronto.ca-20070225151516-38bls2quulk8xsu5
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: dirstate
        timestamp: Sun 2007-02-25 10:33:42 -0500
        message:
          Fix test locking for dirstate
        ------------------------------------------------------------
        revno: 2255.2.104.1.8
        merged: aaron.bentley at utoronto.ca-20070225151516-38bls2quulk8xsu5
        parent: aaron.bentley at utoronto.ca-20070224161132-ymdyp4vnbab7ewfe
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: dirstate
        timestamp: Sun 2007-02-25 10:15:16 -0500
        message:
          Merge refactoring of add_reference
        ------------------------------------------------------------
        revno: 2255.2.104.1.7
        merged: aaron.bentley at utoronto.ca-20070224161132-ymdyp4vnbab7ewfe
        parent: aaron.bentley at utoronto.ca-20070224153100-2wjayj3uwtges1u2
        parent: john at arbash-meinel.com-20070223225101-92gi3mujiugb0tk0
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: dirstate
        timestamp: Sat 2007-02-24 11:11:32 -0500
        message:
          Merge from dirstate
        ------------------------------------------------------------
        revno: 2255.2.104.1.6
        merged: aaron.bentley at utoronto.ca-20070224153100-2wjayj3uwtges1u2
        parent: aaron.bentley at utoronto.ca-20070223054754-v9b1sjlwti19kzq3
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: dirstate
        timestamp: Sat 2007-02-24 10:31:00 -0500
        message:
          Fix update to set unique roots, and work with dirstate
        ------------------------------------------------------------
        revno: 2255.2.104.1.5
        merged: aaron.bentley at utoronto.ca-20070223054754-v9b1sjlwti19kzq3
        parent: aaron.bentley at utoronto.ca-20070223054726-298pl3o2u3d7lsy1
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: dirstate
        timestamp: Fri 2007-02-23 00:47:54 -0500
        message:
          fix revision_tree tests
        ------------------------------------------------------------
        revno: 2255.2.104.1.4
        merged: aaron.bentley at utoronto.ca-20070223054726-298pl3o2u3d7lsy1
        parent: aaron.bentley at utoronto.ca-20070223044530-2ggdpsjtboqeosi5
        parent: john at arbash-meinel.com-20070223030108-da1z3sofjti2xulz
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: dirstate
        timestamp: Fri 2007-02-23 00:47:26 -0500
        message:
          merge from dirstate
        ------------------------------------------------------------
        revno: 2255.2.104.1.3
        merged: aaron.bentley at utoronto.ca-20070223044530-2ggdpsjtboqeosi5
        parent: aaron.bentley at utoronto.ca-20070223042529-jf4altbwxy26y965
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: dirstate
        timestamp: Thu 2007-02-22 23:45:30 -0500
        message:
          tweak tests
        ------------------------------------------------------------
        revno: 2255.2.104.1.2
        merged: aaron.bentley at utoronto.ca-20070223042529-jf4altbwxy26y965
        parent: aaron.bentley at utoronto.ca-20070222055157-27illmnxqr1s6rkj
        parent: robertc at robertcollins.net-20070222060839-tv56d0biir2ipav1
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: dirstate
        timestamp: Thu 2007-02-22 23:25:29 -0500
        message:
          Merge fix from mainline
        ------------------------------------------------------------
        revno: 2255.2.104.1.1
        merged: aaron.bentley at utoronto.ca-20070222055157-27illmnxqr1s6rkj
        parent: robertc at robertcollins.net-20070222050658-m9gdlj1ypv2gqvjx
        parent: aaron.bentley at utoronto.ca-20070221060606-unjaailciijp12ab
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: dirstate
        timestamp: Thu 2007-02-22 00:51:57 -0500
        message:
          Merge from by-reference-trees
        ------------------------------------------------------------
        revno: 2100.3.37
        merged: aaron.bentley at utoronto.ca-20070221060606-unjaailciijp12ab
        parent: aaron.bentley at utoronto.ca-20070221054318-aq9ka6dgoo42ht8c
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Wed 2007-02-21 01:06:06 -0500
        message:
          rename working tree format 4 to AB1 everywhere
        ------------------------------------------------------------
        revno: 2100.3.36
        merged: aaron.bentley at utoronto.ca-20070221054318-aq9ka6dgoo42ht8c
        parent: aaron.bentley at utoronto.ca-20070221051255-487kfuufebg675ac
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Wed 2007-02-21 00:43:18 -0500
        message:
          avoid subtree commit when converting a work tree into a revision tree
        ------------------------------------------------------------
        revno: 2100.3.35
        merged: aaron.bentley at utoronto.ca-20070221051255-487kfuufebg675ac
        parent: aaron.bentley at utoronto.ca-20070217211119-ggocr9ne4ua1udac
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Wed 2007-02-21 00:12:55 -0500
        message:
          equality operations on bzrdir
        ------------------------------------------------------------
        revno: 2100.3.34
        merged: aaron.bentley at utoronto.ca-20070217211119-ggocr9ne4ua1udac
        parent: aaron.bentley at utoronto.ca-20070217202142-58mh87yi27etx8o0
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Sat 2007-02-17 16:11:19 -0500
        message:
          Fix BzrDir.cloning_metadir with no format
        ------------------------------------------------------------
        revno: 2100.3.33
        merged: aaron.bentley at utoronto.ca-20070217202142-58mh87yi27etx8o0
        parent: aaron.bentley at utoronto.ca-20070217201404-52tyj7fg32n0rv0h
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Sat 2007-02-17 15:21:42 -0500
        message:
          Handle unique roots in tests for TreeTransform.iter_changes
        ------------------------------------------------------------
        revno: 2100.3.32
        merged: aaron.bentley at utoronto.ca-20070217201404-52tyj7fg32n0rv0h
        parent: aaron.bentley at utoronto.ca-20070216070219-b22k0gwnisnxawnk
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Sat 2007-02-17 15:14:04 -0500
        message:
          fix tree format, basis_tree call, in sprout
        ------------------------------------------------------------
        revno: 2100.3.31
        merged: aaron.bentley at utoronto.ca-20070216070219-b22k0gwnisnxawnk
        parent: aaron.bentley at utoronto.ca-20070209071620-gp2n7vtjyb0f2x1e
        parent: pqm at pqm.ubuntu.com-20070215181416-864dbe690a0f3da8
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Fri 2007-02-16 02:02:19 -0500
        message:
          Merged bzr.dev (17 tests failing)
        ------------------------------------------------------------
        revno: 2100.3.30
        merged: aaron.bentley at utoronto.ca-20070209071620-gp2n7vtjyb0f2x1e
        parent: aaron.bentley at utoronto.ca-20070209071255-74pex0pbd0gelb1u
        parent: pqm at pqm.ubuntu.com-20070207230659-d4b568ed7b4cec4e
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Fri 2007-02-09 02:16:20 -0500
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        revno: 2100.3.29
        merged: aaron.bentley at utoronto.ca-20070209071255-74pex0pbd0gelb1u
        parent: aaron.bentley at utoronto.ca-20070127233908-uon1klmy81mo1yfx
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Fri 2007-02-09 02:12:55 -0500
        message:
          Get merge working initially
        ------------------------------------------------------------
        revno: 2100.3.28
        merged: aaron.bentley at utoronto.ca-20070127233908-uon1klmy81mo1yfx
        parent: aaron.bentley at utoronto.ca-20070127201700-zpa95eucj24u8pyp
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Sat 2007-01-27 18:39:08 -0500
        message:
          Make sprout recursive
        ------------------------------------------------------------
        revno: 2100.3.27
        merged: aaron.bentley at utoronto.ca-20070127201700-zpa95eucj24u8pyp
        parent: aaron.bentley at utoronto.ca-20070127182827-4b8dg34lxi8ipuwe
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Sat 2007-01-27 15:17:00 -0500
        message:
          Enable nested commits
        ------------------------------------------------------------
        revno: 2100.3.26
        merged: aaron.bentley at utoronto.ca-20070127182827-4b8dg34lxi8ipuwe
        parent: aaron.bentley at utoronto.ca-20070127170241-669zhj1p5d28wgu2
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Sat 2007-01-27 13:28:27 -0500
        message:
          checkout type is maintained for subtrees
        ------------------------------------------------------------
        revno: 2100.3.25
        merged: aaron.bentley at utoronto.ca-20070127170241-669zhj1p5d28wgu2
        parent: aaron.bentley at utoronto.ca-20070126053435-23q8s18dsystsh8b
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Sat 2007-01-27 12:02:41 -0500
        message:
          add subsubtree to test
        ------------------------------------------------------------
        revno: 2100.3.24
        merged: aaron.bentley at utoronto.ca-20070126053435-23q8s18dsystsh8b
        parent: aaron.bentley at utoronto.ca-20070126041844-0sb1f2eq7ovqe63j
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Fri 2007-01-26 00:34:35 -0500
        message:
          Get all tests passing again
        ------------------------------------------------------------
        revno: 2100.3.23
        merged: aaron.bentley at utoronto.ca-20070126041844-0sb1f2eq7ovqe63j
        parent: aaron.bentley at utoronto.ca-20070126040012-j80k7qhvj80dyp9j
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Thu 2007-01-25 23:18:44 -0500
        message:
          Nested checkouts kinda work
        ------------------------------------------------------------
        revno: 2100.3.22
        merged: aaron.bentley at utoronto.ca-20070126040012-j80k7qhvj80dyp9j
        parent: aaron.bentley at utoronto.ca-20070115131020-wr397y8izr6i2epm
        parent: pqm at pqm.ubuntu.com-20070125194626-4ded330415b7276d
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Thu 2007-01-25 23:00:12 -0500
        message:
          merge from bzr.dev
        ------------------------------------------------------------
        revno: 2100.3.21
        merged: aaron.bentley at utoronto.ca-20070115131020-wr397y8izr6i2epm
        parent: aaron.bentley at utoronto.ca-20070112044818-nnw6iunriqq073qc
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Mon 2007-01-15 08:10:20 -0500
        message:
          Work on checking out by-reference trees
        ------------------------------------------------------------
        revno: 2100.3.20
        merged: aaron.bentley at utoronto.ca-20070112044818-nnw6iunriqq073qc
        parent: aaron.bentley at utoronto.ca-20070111051628-zm6q793yyxhewifj
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Thu 2007-01-11 23:48:18 -0500
        message:
          Implement tree comparison for tree references
        ------------------------------------------------------------
        revno: 2100.3.19
        merged: aaron.bentley at utoronto.ca-20070111051628-zm6q793yyxhewifj
        parent: aaron.bentley at utoronto.ca-20070111044206-dav6kgz24cd08ec0
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Thu 2007-01-11 00:16:28 -0500
        message:
          Ensure commit preserves reference revision
        ------------------------------------------------------------
        revno: 2100.3.18
        merged: aaron.bentley at utoronto.ca-20070111044206-dav6kgz24cd08ec0
        parent: aaron.bentley at utoronto.ca-20070111034653-wa1n3uy49wbvom5m
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Wed 2007-01-10 23:42:06 -0500
        message:
          Get commit working for tree references
        ------------------------------------------------------------
        revno: 2100.3.17
        merged: aaron.bentley at utoronto.ca-20070111034653-wa1n3uy49wbvom5m
        parent: aaron.bentley at utoronto.ca-20070111031041-cu4tmhma4sqjph48
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Wed 2007-01-10 22:46:53 -0500
        message:
          Remove get_format_*, make FormatRegistry.register_metadir vary working tree
        ------------------------------------------------------------
        revno: 2100.3.16
        merged: aaron.bentley at utoronto.ca-20070111031041-cu4tmhma4sqjph48
        parent: aaron.bentley at utoronto.ca-20061222051434-mv7zhuh0wp8hhfi8
        parent: pqm at pqm.ubuntu.com-20070111014309-058f987c23817400
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Wed 2007-01-10 22:10:41 -0500
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        revno: 2100.3.15
        merged: aaron.bentley at utoronto.ca-20061222051434-mv7zhuh0wp8hhfi8
        parent: aaron.bentley at utoronto.ca-20061222032850-nfiemdjr81urpbm3
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Fri 2006-12-22 00:14:34 -0500
        message:
          get test suite passing
        ------------------------------------------------------------
        revno: 2100.3.14
        merged: aaron.bentley at utoronto.ca-20061222032850-nfiemdjr81urpbm3
        parent: aaron.bentley at utoronto.ca-20061222020006-8h1kgh4iax3c90ju
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Thu 2006-12-21 22:28:50 -0500
        message:
          Test workingtree4 format, prevent use with old repos
        ------------------------------------------------------------
        revno: 2100.3.13
        merged: aaron.bentley at utoronto.ca-20061222020006-8h1kgh4iax3c90ju
        parent: aaron.bentley at utoronto.ca-20061211233228-wh8chcfx949px2c2
        parent: pqm at pqm.ubuntu.com-20061221204334-f206a0f736499cc8
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Thu 2006-12-21 21:00:06 -0500
        message:
          merge bzr.dev
        ------------------------------------------------------------
        revno: 2100.3.12
        merged: aaron.bentley at utoronto.ca-20061211233228-wh8chcfx949px2c2
        parent: aaron.bentley at utoronto.ca-20061211054923-fd8abzfza1g86zn7
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Mon 2006-12-11 18:32:28 -0500
        message:
          Stop generating unique roots for WorkingTree3
        ------------------------------------------------------------
        revno: 2100.3.11
        merged: aaron.bentley at utoronto.ca-20061211054923-fd8abzfza1g86zn7
        parent: aaron.bentley at utoronto.ca-20061211052748-672fjh70mzze3qkh
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Mon 2006-12-11 00:49:23 -0500
        message:
          Add join --reference support
        ------------------------------------------------------------
        revno: 2100.3.10
        merged: aaron.bentley at utoronto.ca-20061211052748-672fjh70mzze3qkh
        parent: aaron.bentley at utoronto.ca-20061211033630-96rvmkj06ed66n27
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Mon 2006-12-11 00:27:48 -0500
        message:
          Ensure added references are serialized properly, beef up Workingtreee3
        ------------------------------------------------------------
        revno: 2100.3.9
        merged: aaron.bentley at utoronto.ca-20061211033630-96rvmkj06ed66n27
        parent: aaron.bentley at utoronto.ca-20061211031105-xne52056x5ozz8yc
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Sun 2006-12-10 22:36:30 -0500
        message:
          Clean up BzrNewError usage
        ------------------------------------------------------------
        revno: 2100.3.8
        merged: aaron.bentley at utoronto.ca-20061211031105-xne52056x5ozz8yc
        parent: aaron.bentley at utoronto.ca-20061210184653-qg4kra59ky1gbgyk
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Sun 2006-12-10 22:11:05 -0500
        message:
          Add add_reference
        ------------------------------------------------------------
        revno: 2100.3.7
        merged: aaron.bentley at utoronto.ca-20061210184653-qg4kra59ky1gbgyk
        parent: aaron.bentley at utoronto.ca-20061210181439-zftpbilg9c0tnbt6
        parent: pqm at pqm.ubuntu.com-20061207005113-3b371f625421645e
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Sun 2006-12-10 13:46:53 -0500
        message:
          Merge from mainline
        ------------------------------------------------------------
        revno: 2100.3.6
        merged: aaron.bentley at utoronto.ca-20061210181439-zftpbilg9c0tnbt6
        parent: aaron.bentley at utoronto.ca-20061210073919-uhgwmvmajy150e8r
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Sun 2006-12-10 13:14:39 -0500
        message:
          Make add recursive for children of added entries
        ------------------------------------------------------------
        revno: 2100.3.5
        merged: aaron.bentley at utoronto.ca-20061210073919-uhgwmvmajy150e8r
        parent: aaron.bentley at utoronto.ca-20061128125857-4gjvcrsxna6czlw9
        parent: aaron.bentley at utoronto.ca-20061015184856-b41c0532eab3d0c9
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Sun 2006-12-10 02:39:19 -0500
        message:
          Merge nested-trees work
            ------------------------------------------------------------
            revno: 1731.1.51.1.25
            merged: aaron.bentley at utoronto.ca-20061015184856-b41c0532eab3d0c9
            parent: aaron.bentley at utoronto.ca-20061014160129-b384ee57bbb311b6
            parent: pqm at pqm.ubuntu.com-20061015163229-648b1f2ebe692136
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: nested-trees
            timestamp: Sun 2006-10-15 14:48:56 -0400
            message:
              Merge from bzr.dev
            ------------------------------------------------------------
            revno: 1731.1.51.1.24
            merged: aaron.bentley at utoronto.ca-20061014160129-b384ee57bbb311b6
            parent: aaron.bentley at utoronto.ca-20061008213516-1608d55ba83da28b
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: nested-trees
            timestamp: Sat 2006-10-14 12:01:29 -0400
            message:
              Fix test case use of get_knit2_format
            ------------------------------------------------------------
            revno: 1731.1.51.1.23
            merged: aaron.bentley at utoronto.ca-20061008213516-1608d55ba83da28b
            parent: aaron.bentley at utoronto.ca-20061008023449-49b7756fe098e601
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: nested-trees
            timestamp: Sun 2006-10-08 17:35:16 -0400
            message:
              Throw user-friendly error splitting in shared repo with wrong format
            ------------------------------------------------------------
            revno: 1731.1.51.1.22
            merged: aaron.bentley at utoronto.ca-20061008023449-49b7756fe098e601
            parent: aaron.bentley at utoronto.ca-20061007142258-d8ea546830f1a325
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: nested-trees
            timestamp: Sat 2006-10-07 22:34:49 -0400
            message:
              Initial work on split command
            ------------------------------------------------------------
            revno: 1731.1.51.1.21
            merged: aaron.bentley at utoronto.ca-20061007142258-d8ea546830f1a325
            parent: aaron.bentley at utoronto.ca-20061007141352-84c34ec2904277ec
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: nested-trees
            timestamp: Sat 2006-10-07 10:22:58 -0400
            message:
              Ensure extracting a subtree dupes the branch
            ------------------------------------------------------------
            revno: 1731.1.51.1.20
            merged: aaron.bentley at utoronto.ca-20061007141352-84c34ec2904277ec
            parent: aaron.bentley at utoronto.ca-20061007141151-a312b936c57881d1
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: nested-trees
            timestamp: Sat 2006-10-07 10:13:52 -0400
            message:
              Add copyright notice to join tests
            ------------------------------------------------------------
            revno: 1731.1.51.1.19
            merged: aaron.bentley at utoronto.ca-20061007141151-a312b936c57881d1
            parent: aaron.bentley at utoronto.ca-20061007140732-519dc817c6977ae5
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: nested-trees
            timestamp: Sat 2006-10-07 10:11:51 -0400
            message:
              update join tests
            ------------------------------------------------------------
            revno: 1731.1.51.1.18
            merged: aaron.bentley at utoronto.ca-20061007140732-519dc817c6977ae5
            parent: aaron.bentley at utoronto.ca-20061007131720-b9a1a0387f949e2a
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: nested-trees
            timestamp: Sat 2006-10-07 10:07:32 -0400
            message:
              Get extract in repository under test
            ------------------------------------------------------------
            revno: 1731.1.51.1.17
            merged: aaron.bentley at utoronto.ca-20061007131720-b9a1a0387f949e2a
            parent: abentley at panoramicfeedback.com-20061002214143-31a300ef43cfd8b8
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: nested-trees
            timestamp: Sat 2006-10-07 09:17:20 -0400
            message:
              Support extracting with checkouts
            ------------------------------------------------------------
            revno: 1731.1.51.1.16
            merged: abentley at panoramicfeedback.com-20061002214143-31a300ef43cfd8b8
            parent: abentley at panoramicfeedback.com-20061002162029-0b63b62e5a5e37d0
            committer: Aaron Bentley <abentley at panoramicfeedback.com>
            branch nick: nested-trees
            timestamp: Mon 2006-10-02 17:41:43 -0400
            message:
              Get extract working for standalone trees
            ------------------------------------------------------------
            revno: 1731.1.51.1.15
            merged: abentley at panoramicfeedback.com-20061002162029-0b63b62e5a5e37d0
            parent: aaron.bentley at utoronto.ca-20060930001629-3fcc62188e83fc29
            parent: abentley at panoramicfeedback.com-20061002130518-5aa716794d33cfe3
            committer: Aaron Bentley <abentley at panoramicfeedback.com>
            branch nick: nested-trees
            timestamp: Mon 2006-10-02 12:20:29 -0400
            message:
              merge unique-root
            ------------------------------------------------------------
            revno: 1731.1.51.1.14
            merged: aaron.bentley at utoronto.ca-20060930001629-3fcc62188e83fc29
            parent: aaron.bentley at utoronto.ca-20060930000328-78c16da9332b5120
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: nested-trees
            timestamp: Fri 2006-09-29 20:16:29 -0400
            message:
              Update for API change
            ------------------------------------------------------------
            revno: 1731.1.51.1.13
            merged: aaron.bentley at utoronto.ca-20060930000328-78c16da9332b5120
            parent: aaron.bentley at utoronto.ca-20060929041439-c15ddb39f20da5df
            parent: pqm at pqm.ubuntu.com-20060929205729-0ee3252a234189f0
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: nested-trees
            timestamp: Fri 2006-09-29 20:03:28 -0400
            message:
              Merge bzr.dev
            ------------------------------------------------------------
            revno: 1731.1.51.1.12
            merged: aaron.bentley at utoronto.ca-20060929041439-c15ddb39f20da5df
            parent: aaron.bentley at utoronto.ca-20060929031649-99cc702f6e46771c
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: nested-trees
            timestamp: Fri 2006-09-29 00:14:39 -0400
            message:
              Clean up subsume test
            ------------------------------------------------------------
            revno: 1731.1.51.1.11
            merged: aaron.bentley at utoronto.ca-20060929031649-99cc702f6e46771c
            parent: aaron.bentley at utoronto.ca-20060929031327-defd00b5b5dc75a4
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: nested-trees
            timestamp: Thu 2006-09-28 23:16:49 -0400
            message:
              Subsume destroys working tree metadata
            ------------------------------------------------------------
            revno: 1731.1.51.1.10
            merged: aaron.bentley at utoronto.ca-20060929031327-defd00b5b5dc75a4
            parent: aaron.bentley at utoronto.ca-20060929025007-633f042bc88a3bba
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: nested-trees
            timestamp: Thu 2006-09-28 23:13:27 -0400
            message:
              Change test for rich root data
            ------------------------------------------------------------
            revno: 1731.1.51.1.9
            merged: aaron.bentley at utoronto.ca-20060929025007-633f042bc88a3bba
            parent: aaron.bentley at utoronto.ca-20060929000831-4c2597019907aa80
            parent: abentley at panoramicfeedback.com-20060927212736-60cf96bee720ad83
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: nested-trees
            timestamp: Thu 2006-09-28 22:50:07 -0400
            message:
              Merge destroy_tree from bzr.ab
            ------------------------------------------------------------
            revno: 1731.1.51.1.8
            merged: aaron.bentley at utoronto.ca-20060929000831-4c2597019907aa80
            parent: abentley at panoramicfeedback.com-20060928210953-20512daf56bbc0f4
            parent: aaron.bentley at utoronto.ca-20060929000413-bb6d513b7171b59f
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: nested-trees
            timestamp: Thu 2006-09-28 20:08:31 -0400
            message:
              Merge from unique-root
            ------------------------------------------------------------
            revno: 1731.1.51.1.7
            merged: abentley at panoramicfeedback.com-20060928210953-20512daf56bbc0f4
            parent: abentley at panoramicfeedback.com-20060927170113-baebe28bdb37927b
            committer: Aaron Bentley <abentley at panoramicfeedback.com>
            branch nick: nested-trees
            timestamp: Thu 2006-09-28 17:09:53 -0400
            message:
              Add join command
            ------------------------------------------------------------
            revno: 1731.1.51.1.6
            merged: abentley at panoramicfeedback.com-20060927170113-baebe28bdb37927b
            parent: abentley at panoramicfeedback.com-20060927165525-53295a1b737fb404
            committer: Aaron Bentley <abentley at panoramicfeedback.com>
            branch nick: nested-trees
            timestamp: Wed 2006-09-27 13:01:13 -0400
            message:
              Ensure subsume data survives reopening the tree
            ------------------------------------------------------------
            revno: 1731.1.51.1.5
            merged: abentley at panoramicfeedback.com-20060927165525-53295a1b737fb404
            parent: abentley at panoramicfeedback.com-20060927161610-a6e0dcc8dedd06eb
            committer: Aaron Bentley <abentley at panoramicfeedback.com>
            branch nick: nested-trees
            timestamp: Wed 2006-09-27 12:55:25 -0400
            message:
              Ensure versionedfile will be produced for subsumed tree root
            ------------------------------------------------------------
            revno: 1731.1.51.1.4
            merged: abentley at panoramicfeedback.com-20060927161610-a6e0dcc8dedd06eb
            parent: aaron.bentley at utoronto.ca-20060927120016-61190f13dfb66355
            committer: Aaron Bentley <abentley at panoramicfeedback.com>
            branch nick: nested-trees
            timestamp: Wed 2006-09-27 12:16:10 -0400
            message:
              Ensure subsume works with Knit2 repos
            ------------------------------------------------------------
            revno: 1731.1.51.1.3
            merged: aaron.bentley at utoronto.ca-20060927120016-61190f13dfb66355
            parent: aaron.bentley at utoronto.ca-20060927052201-2256fa7dc07a50ac
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: nested-trees
            timestamp: Wed 2006-09-27 08:00:16 -0400
            message:
              Handle unversioned parents during subsume
            ------------------------------------------------------------
            revno: 1731.1.51.1.2
            merged: aaron.bentley at utoronto.ca-20060927052201-2256fa7dc07a50ac
            parent: aaron.bentley at utoronto.ca-20060927041552-4283b801890541b6
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: nested-trees
            timestamp: Wed 2006-09-27 01:22:01 -0400
            message:
              Test subsume failure modes
            ------------------------------------------------------------
            revno: 1731.1.51.1.1
            merged: aaron.bentley at utoronto.ca-20060927041552-4283b801890541b6
            parent: aaron.bentley at utoronto.ca-20060927022844-5f7f1374d31fd15b
            committer: Aaron Bentley <aaron.bentley at utoronto.ca>
            branch nick: nested-trees
            timestamp: Wed 2006-09-27 00:15:52 -0400
            message:
              Initial subsume implementation
        ------------------------------------------------------------
        revno: 2100.3.4
        merged: aaron.bentley at utoronto.ca-20061128125857-4gjvcrsxna6czlw9
        parent: aaron.bentley at utoronto.ca-20061029195620-4984eff282cb1024
        parent: pqm at pqm.ubuntu.com-20061127233027-5ecdd1e9f711b211
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Tue 2006-11-28 07:58:57 -0500
        message:
          Merge from bzr.dev
        ------------------------------------------------------------
        revno: 2100.3.3
        merged: aaron.bentley at utoronto.ca-20061029195620-4984eff282cb1024
        parent: aaron.bentley at utoronto.ca-20061029191704-b7221b5e8a873911
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Sun 2006-10-29 14:56:20 -0500
        message:
          Start of work on format 4 trees
        ------------------------------------------------------------
        revno: 2100.3.2
        merged: aaron.bentley at utoronto.ca-20061029191704-b7221b5e8a873911
        parent: aaron.bentley at utoronto.ca-20061029183057-af9d71b62956a668
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Sun 2006-10-29 14:17:04 -0500
        message:
          Add tests for format 7, enforce number
        ------------------------------------------------------------
        revno: 2100.3.1
        merged: aaron.bentley at utoronto.ca-20061029183057-af9d71b62956a668
        parent: pqm at pqm.ubuntu.com-20061027225241-7339e4c92f55536c
        committer: Aaron Bentley <aaron.bentley at utoronto.ca>
        branch nick: by-reference-trees
        timestamp: Sun 2006-10-29 13:30:57 -0500
        message:
          Start roundtripping tree-reference entries
    ------------------------------------------------------------
    revno: 2255.2.151
    merged: robertc at robertcollins.net-20070226013238-w7sjnnn1d7uvcpg5
    parent: robertc at robertcollins.net-20070226011304-8m29bgwjl3iey0g9
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-26 12:32:38 +1100
    message:
      Handle specific_files natively for WorkingTreeFormat4._iter_changes.
    ------------------------------------------------------------
    revno: 2255.2.150
    merged: robertc at robertcollins.net-20070226011304-8m29bgwjl3iey0g9
    parent: robertc at robertcollins.net-20070226010636-gqr477uau3uckz9x
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-26 12:13:04 +1100
    message:
      Unbreak status --short.
    ------------------------------------------------------------
    revno: 2255.2.149
    merged: robertc at robertcollins.net-20070226010636-gqr477uau3uckz9x
    parent: john at arbash-meinel.com-20070226004721-mxcueak27y98r1vk
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-26 12:06:36 +1100
    message:
      Crufty but existing _iter_changes implementation for WorkingTreeFormat4.
    ------------------------------------------------------------
    revno: 2255.2.148
    merged: john at arbash-meinel.com-20070226004721-mxcueak27y98r1vk
    parent: john at arbash-meinel.com-20070226004531-f5j0onpamaehk9ob
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Sun 2007-02-25 18:47:21 -0600
    message:
      lock a basis tree during a commit test.
    ------------------------------------------------------------
    revno: 2255.2.147
    merged: john at arbash-meinel.com-20070226004531-f5j0onpamaehk9ob
    parent: john at arbash-meinel.com-20070225232832-0i66e7smyz5po931
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Sun 2007-02-25 18:45:31 -0600
    message:
      Move fast id => path lookups down into DirState
      It belongs there anyway, and it means all _get_entry(file_id) lookups
      will be improved, rather than just id2path.
    ------------------------------------------------------------
    revno: 2255.2.146
    merged: john at arbash-meinel.com-20070225232832-0i66e7smyz5po931
    parent: robertc at robertcollins.net-20070225225034-fts7vcvfhkqwcms8
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Sun 2007-02-25 17:28:32 -0600
    message:
      Implement move_directory by factoring out move_one
      as a helper function, and then implementing a recursive update for
      all moved dirblocks.
    ------------------------------------------------------------
    revno: 2255.2.145
    merged: robertc at robertcollins.net-20070225225034-fts7vcvfhkqwcms8
    parent: john at arbash-meinel.com-20070225220748-zhn0hzx6zo92vfcz
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-26 09:50:34 +1100
    message:
      Support unbreakable locks for trees.
    ------------------------------------------------------------
    revno: 2255.2.144
    merged: john at arbash-meinel.com-20070225220748-zhn0hzx6zo92vfcz
    parent: robertc at robertcollins.net-20070225215219-xrrl2gv0hfw6ijzh
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Sun 2007-02-25 16:07:48 -0600
    message:
      Simplify update_minimal a bit more, by making id_index a
      cached variable, which is updated on mutating operations
      also use this to implement a faster id2path, and add direct tests
      since id2path now uses a more complex implementation.
    ------------------------------------------------------------
    revno: 2255.2.143
    merged: robertc at robertcollins.net-20070225215219-xrrl2gv0hfw6ijzh
    parent: john at arbash-meinel.com-20070225210822-22ll2yy3qfeo5bko
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-26 08:52:19 +1100
    message:
      Update break-lock blackbox test to not break with dirstate as the default tree format. Unfortunately this slightly reduces test coverage of the UI.
    ------------------------------------------------------------
    revno: 2255.2.142
    merged: john at arbash-meinel.com-20070225210822-22ll2yy3qfeo5bko
    parent: john at arbash-meinel.com-20070225203634-gkj6ic15hpadb5np
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Sun 2007-02-25 15:08:22 -0600
    message:
      Simplify the update_minimal api a little bit, and document the parameters.
      Switch from kind => minikind, since we frequently already have that anyway,
      and update_minimal is a thin wrapper on changing the dirblocks in memory, not
      converting from an Inventory.
    ------------------------------------------------------------
    revno: 2255.2.141
    merged: john at arbash-meinel.com-20070225203634-gkj6ic15hpadb5np
    parent: john at arbash-meinel.com-20070225191617-wcc828lmf5sdad47
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Sun 2007-02-25 14:36:34 -0600
    message:
      Some small changes to move tests.
    ------------------------------------------------------------
    revno: 2255.2.140
    merged: john at arbash-meinel.com-20070225191617-wcc828lmf5sdad47
    parent: john at arbash-meinel.com-20070225185403-hzll8ix723xzy06o
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Sun 2007-02-25 13:16:17 -0600
    message:
      Update tests to ensure basis tree is not modified
      Small bugfixes for things that would only be triggered if update_minimal
      failed.
    ------------------------------------------------------------
    revno: 2255.2.139
    merged: john at arbash-meinel.com-20070225185403-hzll8ix723xzy06o
    parent: john at arbash-meinel.com-20070225181821-e55vnu73mm0kzmxe
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Sun 2007-02-25 12:54:03 -0600
    message:
      test cases for moving after a file has already been moved.
      Fix some more WorkingTree4.move() bugs.
    ------------------------------------------------------------
    revno: 2255.2.138
    merged: john at arbash-meinel.com-20070225181821-e55vnu73mm0kzmxe
    parent: john at arbash-meinel.com-20070225172022-1lz2vdjp84vp3lu3
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Sun 2007-02-25 12:18:21 -0600
    message:
      implement several new WorkingTree.move() tests
      and fix the bugs in WorkingTree4.move() that it uncovers.
    ------------------------------------------------------------
    revno: 2255.2.137
    merged: john at arbash-meinel.com-20070225172022-1lz2vdjp84vp3lu3
    parent: john at arbash-meinel.com-20070225171143-dcj0kgtu8kf2o0is
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Sun 2007-02-25 11:20:22 -0600
    message:
      Move the WorkingTree.move() tests into their own module
      and remove the requirement for maintaining api compatibility for the
      new WorkingTreeFormat4, its ugly and deprecated anyway.
    ------------------------------------------------------------
    revno: 2255.2.136
    merged: john at arbash-meinel.com-20070225171143-dcj0kgtu8kf2o0is
    parent: john at arbash-meinel.com-20070225170249-fcgtqn57yinqxsc2
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Sun 2007-02-25 11:11:43 -0600
    message:
      (James Westby) add read locks around read_working_inventory() in test_commit_move
    ------------------------------------------------------------
    revno: 2255.2.135
    merged: john at arbash-meinel.com-20070225170249-fcgtqn57yinqxsc2
    parent: john at arbash-meinel.com-20070225165633-d9x1okv4g33idiya
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Sun 2007-02-25 11:02:49 -0600
    message:
      Add locking in the test_commit_kind_changes test.
    ------------------------------------------------------------
    revno: 2255.2.134
    merged: john at arbash-meinel.com-20070225165633-d9x1okv4g33idiya
    parent: john at arbash-meinel.com-20070225162253-8expr1vlo70wxp72
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Sun 2007-02-25 10:56:33 -0600
    message:
      Add a tree-test for get_symlink_target
      and implement it in DirStateRevisionTree.
    ------------------------------------------------------------
    revno: 2255.2.133
    merged: john at arbash-meinel.com-20070225162253-8expr1vlo70wxp72
    parent: john at arbash-meinel.com-20070225144550-3rcyjf6ui5oo0gaf
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Sun 2007-02-25 10:22:53 -0600
    message:
      Implement _paths2ids using bisect recursive rather than loading
      the whole dataset from disk. But leave it disabled until it can actually benefit
      us by having other code paths not require the whole dir-state in memory.
    ------------------------------------------------------------
    revno: 2255.2.132
    merged: john at arbash-meinel.com-20070225144550-3rcyjf6ui5oo0gaf
    parent: john at arbash-meinel.com-20070224164555-575dae290us6da8o
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Sun 2007-02-25 08:45:50 -0600
    message:
      Implement _bisect_recursive, which uses multiple bisect calls to
      handle renames and finding entries in subdirs.
      As is, this could be hooked into paths2ids() if the dirstate has not been loaded yet.
      However, it doesn't quite provide enough, since the parsed entries would probably not
      be saved. Further, the multiple bisect calls are less efficient then they could be,
      because they do not remember the last bisect call.
      We should explore switching to a caching structure, which maintains all records that
      have been processed, in a structure that can be in-memory searched before going back
      to disk.
    ------------------------------------------------------------
    revno: 2255.2.131
    merged: john at arbash-meinel.com-20070224164555-575dae290us6da8o
    parent: john at arbash-meinel.com-20070224160033-rr51vbz5f91z6jvw
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Sat 2007-02-24 10:45:55 -0600
    message:
      Change the return values for bisect functions so they just return
      the found dictionaries. This saves processing, and is more useful for a future
      _bisect_recursive function.
    ------------------------------------------------------------
    revno: 2255.2.130
    merged: john at arbash-meinel.com-20070224160033-rr51vbz5f91z6jvw
    parent: john at arbash-meinel.com-20070223225101-92gi3mujiugb0tk0
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Sat 2007-02-24 10:00:33 -0600
    message:
      Add a very similar function which grabs everything for a particular directory block.
    ------------------------------------------------------------
    revno: 2255.2.129
    merged: john at arbash-meinel.com-20070223225101-92gi3mujiugb0tk0
    parent: john at arbash-meinel.com-20070223220821-yjinik850b8szgqj
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Fri 2007-02-23 16:51:01 -0600
    message:
      Start cleaning up the code, and fix one more edge case
      when last_entry == first_entry, we don't want to have duplicated entries
      in the output.
    ------------------------------------------------------------
    revno: 2255.2.128
    merged: john at arbash-meinel.com-20070223220821-yjinik850b8szgqj
    parent: john at arbash-meinel.com-20070223213737-k94ppwskpppa7nds
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Fri 2007-02-23 16:08:21 -0600
    message:
      Rather than falling over when the page size is to small, just increase it and try again.
    ------------------------------------------------------------
    revno: 2255.2.127
    merged: john at arbash-meinel.com-20070223213737-k94ppwskpppa7nds
    parent: john at arbash-meinel.com-20070223211937-2reect5p16takng2
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Fri 2007-02-23 15:37:37 -0600
    message:
      Expand the test suite to cover more cases.
    ------------------------------------------------------------
    revno: 2255.2.126
    merged: john at arbash-meinel.com-20070223211937-2reect5p16takng2
    parent: john at arbash-meinel.com-20070223174705-n1j4wyfh5jrlku7s
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Fri 2007-02-23 15:19:37 -0600
    message:
      Switch the bisect code to support the fact that we can have
      repeated (dir, name) pairs (dir, name, file_id) is the unique key.
      Also, fix some edge cases when the page size is small so that we don't get clean
      divisions of records per page.
    ------------------------------------------------------------
    revno: 2255.2.125
    merged: john at arbash-meinel.com-20070223174705-n1j4wyfh5jrlku7s
    parent: john at arbash-meinel.com-20070223151256-g1imdh471lwffdzs
    parent: john at arbash-meinel.com-20070222154410-svh8iq9j7f8ci302
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Fri 2007-02-23 11:47:05 -0600
    message:
      Initial effort at adding a basic _bisect function to DirState.
      It doesn't handle the fact that a single path can occur multiple times, but that
      will be fixed.
        ------------------------------------------------------------
        revno: 2255.2.88.1.2
        merged: john at arbash-meinel.com-20070222154410-svh8iq9j7f8ci302
        parent: john at arbash-meinel.com-20070221201710-siq76rbcfpj68gqx
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate-jam
        timestamp: Thu 2007-02-22 09:44:10 -0600
        message:
          (broken) some basic work on adding bisect functionality to dirstate.
    ------------------------------------------------------------
    revno: 2255.2.124
    merged: john at arbash-meinel.com-20070223151256-g1imdh471lwffdzs
    parent: john at arbash-meinel.com-20070223150732-bjo6ava5jclmkjg3
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate-alt
    timestamp: Fri 2007-02-23 09:12:56 -0600
    message:
      Remove direct access to Dirstate prefering dirstate.Dirstate
    ------------------------------------------------------------
    revno: 2255.2.123
    merged: john at arbash-meinel.com-20070223150732-bjo6ava5jclmkjg3
    parent: robertc at robertcollins.net-20070223051206-jqheguu2qeyqab14
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate-alt
    timestamp: Fri 2007-02-23 09:07:32 -0600
    message:
      Simple line wrapping cleanup in test_dirstate.py
    ------------------------------------------------------------
    revno: 2255.2.122
    merged: robertc at robertcollins.net-20070223051206-jqheguu2qeyqab14
    parent: john at arbash-meinel.com-20070223030108-da1z3sofjti2xulz
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Fri 2007-02-23 16:12:06 +1100
    message:
      Alter intertree implementation tests to let dirstate inter-trees be correctly parameterised.
    ------------------------------------------------------------
    revno: 2255.2.121
    merged: john at arbash-meinel.com-20070223030108-da1z3sofjti2xulz
    parent: john at arbash-meinel.com-20070223025058-dw62sga95cx45hvg
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 21:01:08 -0600
    message:
      split out the WorkingTreeFormat4 tests into a separate test file
      and clean up the imports of both files.
    ------------------------------------------------------------
    revno: 2255.2.120
    merged: john at arbash-meinel.com-20070223025058-dw62sga95cx45hvg
    parent: robertc at robertcollins.net-20070223020403-ojzvhu79itqx004a
    parent: john at arbash-meinel.com-20070223022410-1i5d131dir9ds30w
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 20:50:58 -0600
    message:
      [merge] in work for adding DirState.lock_* methods
        ------------------------------------------------------------
        revno: 2255.2.116.1.3
        merged: john at arbash-meinel.com-20070223022410-1i5d131dir9ds30w
        parent: john at arbash-meinel.com-20070223021644-7hp2p2f3rjvkmx4s
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Thu 2007-02-22 20:24:10 -0600
        message:
          XXX Workaround the DirStateRevisionTree bug until we get a proper fix, tests pass again
        ------------------------------------------------------------
        revno: 2255.2.116.1.2
        merged: john at arbash-meinel.com-20070223021644-7hp2p2f3rjvkmx4s
        parent: john at arbash-meinel.com-20070223011122-eyncc8ny0hchp0qc
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Thu 2007-02-22 20:16:44 -0600
        message:
          (broken) lock and unlock the DirState object when locking and unlocking the Tree itself
          broken because we have timing issues with parent ids disappearing on us
        ------------------------------------------------------------
        revno: 2255.2.116.1.1
        merged: john at arbash-meinel.com-20070223011122-eyncc8ny0hchp0qc
        parent: john at arbash-meinel.com-20070222232615-46n3rjdpfrsbmu3b
        parent: jw+debian at jameswestby.net-20070222224549-16u0yxrdrqg3vgpg
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Thu 2007-02-22 19:11:22 -0600
        message:
          Update the dirstate tests to lock and unlock properly.
          Change the lock.WriteLock functions so that they open in 'rb+' mode instead
          of automatically truncating the file.
          test_dirstate.py now passes, but we need to figure out or locking mechanism for
          WorkingTree4. (does it just lock at the same time as Tree.lock_write()?)
        ------------------------------------------------------------
        revno: 2255.2.115.1.2
        merged: jw+debian at jameswestby.net-20070222224549-16u0yxrdrqg3vgpg
        parent: jw+debian at jameswestby.net-20070222212253-lacx7ppcjunahmio
        committer: James Westby <jw+debian at jameswestby.net>
        branch nick: dirstate
        timestamp: Thu 2007-02-22 22:45:49 +0000
        message:
          (broken) Add the locking methods.
          
            * Callers should now use lock_read and lock_write before they do
              anything with dirstate.
            * You can only grab a single lock on the object, and can't unlock it
              if not locked.
            * initialize now returns a writelocked object to the caller.
            * This breaks the tests massively, sorry, as they need to do locking now.
              - Currently the main problem is the dirstate never being flushed to disk,
                so all tests trip the assertion that the header is incorrect.
        ------------------------------------------------------------
        revno: 2255.2.115.1.1
        merged: jw+debian at jameswestby.net-20070222212253-lacx7ppcjunahmio
        parent: john at arbash-meinel.com-20070222202320-k3x9ozxjj2ugnygc
        committer: James Westby <jw+debian at jameswestby.net>
        branch nick: dirstate
        timestamp: Thu 2007-02-22 21:22:53 +0000
        message:
          Store the filename of the dirstate in an attribute.
          
            * Store the filename so that it can be more adventurous in what it does
              with the file.
            * Callers of the constructor should now pass the path to it, and any
              methods that want to access the path should do so through self._filename.
    ------------------------------------------------------------
    revno: 2255.2.119
    merged: robertc at robertcollins.net-20070223020403-ojzvhu79itqx004a
    parent: robertc at robertcollins.net-20070223013602-qrkqs22lbp5jrfsv
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Fri 2007-02-23 13:04:03 +1100
    message:
      Give RevisionTree a repr method.
    ------------------------------------------------------------
    revno: 2255.2.118
    merged: robertc at robertcollins.net-20070223013602-qrkqs22lbp5jrfsv
    parent: robertc at robertcollins.net-20070223011050-5psttlyujfn5b5em
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Fri 2007-02-23 12:36:02 +1100
    message:
      Change _iter_changes tests to lock the tested trees - its an iterator interface so implicit locks dont ensure the tree is locked - callers need to lock and thus so do our tests.
    ------------------------------------------------------------
    revno: 2255.2.117
    merged: robertc at robertcollins.net-20070223011050-5psttlyujfn5b5em
    parent: john at arbash-meinel.com-20070222232615-46n3rjdpfrsbmu3b
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Fri 2007-02-23 12:10:50 +1100
    message:
      Add an InterDirStateTree InterTree optimiser.
    ------------------------------------------------------------
    revno: 2255.2.116
    merged: john at arbash-meinel.com-20070222232615-46n3rjdpfrsbmu3b
    parent: john at arbash-meinel.com-20070222202320-k3x9ozxjj2ugnygc
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 17:26:15 -0600
    message:
      hack in a faster id2path, ultimately we want something different.
    ------------------------------------------------------------
    revno: 2255.2.115
    merged: john at arbash-meinel.com-20070222202320-k3x9ozxjj2ugnygc
    parent: john at arbash-meinel.com-20070222195349-10k878qe13qdhoqd
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 14:23:20 -0600
    message:
      _get_inventory 1.75s: Directly update the inventory state rather than using inv.add()
      we don't need the same safety checks, since we are loading from a state
      which should already be consistent.
    ------------------------------------------------------------
    revno: 2255.2.114
    merged: john at arbash-meinel.com-20070222195349-10k878qe13qdhoqd
    parent: john at arbash-meinel.com-20070222184235-2q0gcimvw3qqudx4
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 13:53:49 -0600
    message:
      _get_inventory: 2.09 => 1.93s by tweaking some of the inner _generate_inventory loops
      (_get_inventory was originally 2.34s before merging bzr.dev)
    ------------------------------------------------------------
    revno: 2255.2.113
    merged: john at arbash-meinel.com-20070222184235-2q0gcimvw3qqudx4
    parent: john at arbash-meinel.com-20070222181111-kbu6t6vc4e9u5yin
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 12:42:35 -0600
    message:
      545ms, 600ms: Switch memory model from storing kind to using minikind
      Need to profile effect on _generate_inventory, but makes a significant improvement for
      both fast path and slow path, and should have minimal effect elsewhere.
    ------------------------------------------------------------
    revno: 2255.2.112
    merged: john at arbash-meinel.com-20070222181111-kbu6t6vc4e9u5yin
    parent: john at arbash-meinel.com-20070222180033-j9r02x6h5nl0e38c
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 12:11:11 -0600
    message:
      610ms: Optimizing _entries_to_current state brings the 'slow path' down to 610 ms (inlined and uglier fast path is 570-580ms)
    ------------------------------------------------------------
    revno: 2255.2.111
    merged: john at arbash-meinel.com-20070222180033-j9r02x6h5nl0e38c
    parent: john at arbash-meinel.com-20070222174747-dlbg1982hqbjcjqu
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 12:00:33 -0600
    message:
      575ms: Remove the inner else in favor of a second loop which just cleans up the root block versus contents-of-root block
    ------------------------------------------------------------
    revno: 2255.2.110
    merged: john at arbash-meinel.com-20070222174747-dlbg1982hqbjcjqu
    parent: john at arbash-meinel.com-20070222165055-9n3m8v0qwjc5kh20
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 11:47:47 -0600
    message:
      Inlining the conversion and using dirblock form instead of a list and then converting shaves another 50ms off. From 650ms => 600ms
    ------------------------------------------------------------
    revno: 2255.2.109
    merged: john at arbash-meinel.com-20070222165055-9n3m8v0qwjc5kh20
    parent: john at arbash-meinel.com-20070222164842-ctd1jolh1nhjvmxb
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 10:50:55 -0600
    message:
      Previous change is 709-724ms => 650-675ms on mozilla sized tree.
    ------------------------------------------------------------
    revno: 2255.2.108
    merged: john at arbash-meinel.com-20070222164842-ctd1jolh1nhjvmxb
    parent: john at arbash-meinel.com-20070222153923-cpynsmaz50pdncre
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 10:48:42 -0600
    message:
      tuple(list[:3]) noticablely slower than (list[0], list[1], list[2])
      Presumably because list[:] has to create a list, which is then converted again into a
      tuple().
    ------------------------------------------------------------
    revno: 2255.2.107
    merged: john at arbash-meinel.com-20070222153923-cpynsmaz50pdncre
    parent: john at arbash-meinel.com-20070222150435-vtrqx5i64319z8pz
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 09:39:23 -0600
    message:
      (working), fix dirstate to use utf8 file ids.
      Also fix a bug in _generate_inventory for non-ascii paths. It was
      combining the decoded path with the utf8 prefix and assuming the
      whole thing was utf8.
    ------------------------------------------------------------
    revno: 2255.2.106
    merged: john at arbash-meinel.com-20070222150435-vtrqx5i64319z8pz
    parent: robertc at robertcollins.net-20070222060839-tv56d0biir2ipav1
    parent: pqm at pqm.ubuntu.com-20070222144505-5f7551602cad9332
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 09:04:35 -0600
    message:
      [merge] bzr.dev 2298 (broken)
    ------------------------------------------------------------
    revno: 2255.2.105
    merged: robertc at robertcollins.net-20070222060839-tv56d0biir2ipav1
    parent: robertc at robertcollins.net-20070222050658-m9gdlj1ypv2gqvjx
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 17:08:39 +1100
    message:
      Unfuck InterTree.compare which I broke with the paths2ids implementation.
    ------------------------------------------------------------
    revno: 2255.2.104
    merged: robertc at robertcollins.net-20070222050658-m9gdlj1ypv2gqvjx
    parent: robertc at robertcollins.net-20070222024924-bokuavlg2yglgtja
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 16:06:58 +1100
    message:
      Add WorkingTree4.paths2ids which is inventory-usage free if the trees being examined are in the dirstate.
    ------------------------------------------------------------
    revno: 2255.2.103
    merged: robertc at robertcollins.net-20070222024924-bokuavlg2yglgtja
    parent: robertc at robertcollins.net-20070222024555-fxhlp024havpj9hd
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 13:49:24 +1100
    message:
      Document some future tests for paths2ids.
    ------------------------------------------------------------
    revno: 2255.2.102
    merged: robertc at robertcollins.net-20070222024555-fxhlp024havpj9hd
    parent: robertc at robertcollins.net-20070222014109-t8lpcgnp6xr63zv8
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 13:45:55 +1100
    message:
      Use Tree.path2ids in status operations.
    ------------------------------------------------------------
    revno: 2255.2.101
    merged: robertc at robertcollins.net-20070222014109-t8lpcgnp6xr63zv8
    parent: robertc at robertcollins.net-20070222011730-zff5fh9qvxrcqa56
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 12:41:09 +1100
    message:
      Finish making Tree.ids2paths support the file_ids_across_trees api.
    ------------------------------------------------------------
    revno: 2255.2.100
    merged: robertc at robertcollins.net-20070222011730-zff5fh9qvxrcqa56
    parent: robertc at robertcollins.net-20070222011415-dtqnanb4cxdl4zus
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 12:17:30 +1100
    message:
      Create a paths2ids api to replace find_ids_across_trees, with tests.
    ------------------------------------------------------------
    revno: 2255.2.99
    merged: robertc at robertcollins.net-20070222011415-dtqnanb4cxdl4zus
    parent: robertc at robertcollins.net-20070222011012-edaxufwi05dcn4az
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 12:14:15 +1100
    message:
      Dirstate - fix _find_block to create missing blocks when the parent is versioned in the current tree, and fix handling of relocated entries in _make_absent.
    ------------------------------------------------------------
    revno: 2255.2.98
    merged: robertc at robertcollins.net-20070222011012-edaxufwi05dcn4az
    parent: john at arbash-meinel.com-20070221224546-3frplqdi81632elw
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Thu 2007-02-22 12:10:12 +1100
    message:
      Perform path2id lookups in dirstate revision trees from the dirstate index without requiring an inventory.
    ------------------------------------------------------------
    revno: 2255.2.97
    merged: john at arbash-meinel.com-20070221224546-3frplqdi81632elw
    parent: robertc at robertcollins.net-20070221111037-k1t9jg5dsgfywz49
    parent: john at arbash-meinel.com-20070221201710-siq76rbcfpj68gqx
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Wed 2007-02-21 16:45:46 -0600
    message:
      Change the inner parsing loop to reduce number of passes, saves about 15% of the time to read and convert to an Inventory
        ------------------------------------------------------------
        revno: 2255.2.88.1.1
        merged: john at arbash-meinel.com-20070221201710-siq76rbcfpj68gqx
        parent: robertc at robertcollins.net-20070220200447-pvv3g67iyk2vro42
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: dirstate
        timestamp: Wed 2007-02-21 14:17:10 -0600
        message:
          Rewrite the inner parsing loop, needs performance testing.
    ------------------------------------------------------------
    revno: 2255.2.96
    merged: robertc at robertcollins.net-20070221111037-k1t9jg5dsgfywz49
    parent: robertc at robertcollins.net-20070221032018-7aon9e56q3sitz6q
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-21 22:10:37 +1100
    message:
      Restore dirstate to all tests passing condition.
    ------------------------------------------------------------
    revno: 2255.2.95
    merged: robertc at robertcollins.net-20070221032018-7aon9e56q3sitz6q
    parent: robertc at robertcollins.net-20070221013745-7d0ho05wt5btnfyl
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-21 14:20:18 +1100
    message:
      Fix WorkingTree4.get_file_sha1 to actually work.
    ------------------------------------------------------------
    revno: 2255.2.94
    merged: robertc at robertcollins.net-20070221013745-7d0ho05wt5btnfyl
    parent: robertc at robertcollins.net-20070221010813-zn13zy3wzd53i3vz
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-21 12:37:45 +1100
    message:
      DirState: handle id lookup redirects correctly.
    ------------------------------------------------------------
    revno: 2255.2.93
    merged: robertc at robertcollins.net-20070221010813-zn13zy3wzd53i3vz
    parent: jw+debian at jameswestby.net-20070220222431-t4esb34p4zxqcqxm
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-21 12:08:13 +1100
    message:
      Dirstate - update WorkingTree4.unversion to the new layout, other tests still borked.
    ------------------------------------------------------------
    revno: 2255.2.92
    merged: jw+debian at jameswestby.net-20070220222431-t4esb34p4zxqcqxm
    parent: jw+debian at jameswestby.net-20070220222024-aotahb9hjsef3m44
    committer: James Westby <jw+debian at jameswestby.net>
    branch nick: dirstate
    timestamp: Tue 2007-02-20 22:24:31 +0000
    message:
      Make the WorkingTree4 has_id use the new _get_entry rather than _get_row.
    ------------------------------------------------------------
    revno: 2255.2.91
    merged: jw+debian at jameswestby.net-20070220222024-aotahb9hjsef3m44
    parent: robertc at robertcollins.net-20070220212335-2zkgn5uemfgig260
    committer: James Westby <jw+debian at jameswestby.net>
    branch nick: dirstate
    timestamp: Tue 2007-02-20 22:20:24 +0000
    message:
      Correct the mistakes in the logic of _get_block_entry_index.
      
        * The exit condition compared all the tuple, rather than the first part,
          so it would always trigger.
        * The wrong variable was incremented, so it would infinite loop if it wasn't
          for the above mistake.
    ------------------------------------------------------------
    revno: 2255.2.90
    merged: robertc at robertcollins.net-20070220212335-2zkgn5uemfgig260
    parent: robertc at robertcollins.net-20070220205121-3xw8a0qe1uql9eeq
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-21 08:23:35 +1100
    message:
      Correct DirState._entries_to_current_state to group entries by directory properly.
    ------------------------------------------------------------
    revno: 2255.2.89
    merged: robertc at robertcollins.net-20070220205121-3xw8a0qe1uql9eeq
    parent: robertc at robertcollins.net-20070220200447-pvv3g67iyk2vro42
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-21 07:51:21 +1100
    message:
      Fix addition of relocation records when we encounter the correct location first try.
    ------------------------------------------------------------
    revno: 2255.2.88
    merged: robertc at robertcollins.net-20070220200447-pvv3g67iyk2vro42
    parent: robertc at robertcollins.net-20070220084410-3msfwqdxfnvi0qa0
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-21 07:04:47 +1100
    message:
      Significant steps back to operation.
    ------------------------------------------------------------
    revno: 2255.2.87
    merged: robertc at robertcollins.net-20070220084410-3msfwqdxfnvi0qa0
    parent: jw+debian at jameswestby.net-20070219221104-c7a9q48h134qrvib
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Tue 2007-02-20 19:44:10 +1100
    message:
      core dirstate tests passing with new structure.
    ------------------------------------------------------------
    revno: 2255.2.86
    merged: jw+debian at jameswestby.net-20070219221104-c7a9q48h134qrvib
    parent: robertc at robertcollins.net-20070219123342-nkosu3g3mt511h59
    committer: James Westby <jw+debian at jameswestby.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-19 22:11:04 +0000
    message:
      Port test_set_path_id_no_parents to the new format of expected entry output.
    ------------------------------------------------------------
    revno: 2255.2.85
    merged: robertc at robertcollins.net-20070219123342-nkosu3g3mt511h59
    parent: john at arbash-meinel.com-20070217040647-1kl4s4bfi01cz1jb
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-19 23:33:42 +1100
    message:
      [BROKEN] Partial conversion to new dirstate structure, please continue on the tests matching dirstate from here.
    ------------------------------------------------------------
    revno: 2255.2.84
    merged: john at arbash-meinel.com-20070217040647-1kl4s4bfi01cz1jb
    parent: john at arbash-meinel.com-20070217033450-q6dtvrwl24ckzg5o
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Fri 2007-02-16 22:06:47 -0600
    message:
      Remove now-unecessary encode/decode calls for revision ids.
      Restore some file_id encode/decode calls because the code still expects unicode file ids.
    ------------------------------------------------------------
    revno: 2255.2.83
    merged: john at arbash-meinel.com-20070217033450-q6dtvrwl24ckzg5o
    parent: robertc at robertcollins.net-20070216142321-2m20xds02xuigsv6
    parent: pqm at pqm.ubuntu.com-20070217025822-306d98c244b53b08
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Fri 2007-02-16 21:34:50 -0600
    message:
      [merge] bzr.dev 2294
    ------------------------------------------------------------
    revno: 2255.2.82
    merged: robertc at robertcollins.net-20070216142321-2m20xds02xuigsv6
    parent: robertc at robertcollins.net-20070216071959-8jibybk31injks6p
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Sat 2007-02-17 01:23:21 +1100
    message:
      various notes about find_ids_across_trees
    ------------------------------------------------------------
    revno: 2255.2.81
    merged: robertc at robertcollins.net-20070216071959-8jibybk31injks6p
    parent: robertc at robertcollins.net-20070216070433-1r4p40b7s3hecuks
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Fri 2007-02-16 18:19:59 +1100
    message:
      WorkingTree4: Implement filter_unversioned_files to use dirstate bisection.
    ------------------------------------------------------------
    revno: 2255.2.80
    merged: robertc at robertcollins.net-20070216070433-1r4p40b7s3hecuks
    parent: robertc at robertcollins.net-20070216065950-axser9wg4u3ta0zs
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Fri 2007-02-16 18:04:33 +1100
    message:
      In status, read lock the old and new trees being used to let data caching occur.
    ------------------------------------------------------------
    revno: 2255.2.79
    merged: robertc at robertcollins.net-20070216065950-axser9wg4u3ta0zs
    parent: robertc at robertcollins.net-20070216065753-svdi0okn46e24474
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Fri 2007-02-16 17:59:50 +1100
    message:
      Take out repository locks from Dirstate revision trees, to improve file text access performance.
    ------------------------------------------------------------
    revno: 2255.2.78
    merged: robertc at robertcollins.net-20070216065753-svdi0okn46e24474
    parent: robertc at robertcollins.net-20070216064426-tfdvexihpqq05csl
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Fri 2007-02-16 17:57:53 +1100
    message:
      Really finish the prior commit.
    ------------------------------------------------------------
    revno: 2255.2.77
    merged: robertc at robertcollins.net-20070216064426-tfdvexihpqq05csl
    parent: robertc at robertcollins.net-20070216061015-60p0vv623cigcg5x
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Fri 2007-02-16 17:44:26 +1100
    message:
      Tune working inventory generation more: walk the blocks, skipping deleted rows.
    ------------------------------------------------------------
    revno: 2255.2.76
    merged: robertc at robertcollins.net-20070216061015-60p0vv623cigcg5x
    parent: robertc at robertcollins.net-20070216060239-yvf7pfd94kv9vqy4
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Fri 2007-02-16 17:10:15 +1100
    message:
      Add tests for revision trees with a different unique root to the current tree.
    ------------------------------------------------------------
    revno: 2255.2.75
    merged: robertc at robertcollins.net-20070216060239-yvf7pfd94kv9vqy4
    parent: robertc at robertcollins.net-20070216023942-8oxrm3qtriwc54w0
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Fri 2007-02-16 17:02:39 +1100
    message:
      Correct generation of revisiontree inventories to handle out of order parents.
    ------------------------------------------------------------
    revno: 2255.2.74
    merged: robertc at robertcollins.net-20070216023942-8oxrm3qtriwc54w0
    parent: robertc at robertcollins.net-20070216022139-bia82eszdktack3k
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Fri 2007-02-16 13:39:42 +1100
    message:
      Minor performance optimisation in _generate_inventory by avoiding normalisation checks and just using a factory to create the inventory entries.
    ------------------------------------------------------------
    revno: 2255.2.73
    merged: robertc at robertcollins.net-20070216022139-bia82eszdktack3k
    parent: john at arbash-meinel.com-20070216010712-31haaz780hytg7e5
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Fri 2007-02-16 13:21:39 +1100
    message:
      50% speedup in the dirstate->inventory conversion logic by caching the parent ids as we walk the tree. Some further work would be to maintain a stack of parents as we know we visit depth first.
    ------------------------------------------------------------
    revno: 2255.2.72
    merged: john at arbash-meinel.com-20070216010712-31haaz780hytg7e5
    parent: john at arbash-meinel.com-20070216005529-97uws9mank4hh12q
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 19:07:12 -0600
    message:
      Add some tests for WorkingTree.basis_tree()
    ------------------------------------------------------------
    revno: 2255.2.71
    merged: john at arbash-meinel.com-20070216005529-97uws9mank4hh12q
    parent: john at arbash-meinel.com-20070215231054-4xry7q64qpodj762
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 18:55:29 -0600
    message:
      Add a test for list_files, and implement it for DirStateRevisionTree
    ------------------------------------------------------------
    revno: 2255.2.70
    merged: john at arbash-meinel.com-20070215231054-4xry7q64qpodj762
    parent: john at arbash-meinel.com-20070215225145-2a7c9snlv3pf87si
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 17:10:54 -0600
    message:
      Minor improvements to DirStateRevisionTree.walkdirs()
    ------------------------------------------------------------
    revno: 2255.2.69
    merged: john at arbash-meinel.com-20070215225145-2a7c9snlv3pf87si
    parent: john at arbash-meinel.com-20070215223629-gt6hhv9b20maurze
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 16:51:45 -0600
    message:
      Implement annotate_iter, get_revision_id, and walkdirs so that all tree_implementations now pass
    ------------------------------------------------------------
    revno: 2255.2.68
    merged: john at arbash-meinel.com-20070215223629-gt6hhv9b20maurze
    parent: john at arbash-meinel.com-20070215223149-fu9dp59wij4p8dkl
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 16:36:29 -0600
    message:
      Switch the WorkingTree4 internals to use state._get_block_row_index
    ------------------------------------------------------------
    revno: 2255.2.67
    merged: john at arbash-meinel.com-20070215223149-fu9dp59wij4p8dkl
    parent: john at arbash-meinel.com-20070215222834-dx28dfubjs9d0kd8
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 16:31:49 -0600
    message:
      Switch to the fast form for path2id
    ------------------------------------------------------------
    revno: 2255.2.66
    merged: john at arbash-meinel.com-20070215222834-dx28dfubjs9d0kd8
    parent: john at arbash-meinel.com-20070215202429-gouwaqj9541v25wf
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 16:28:34 -0600
    message:
      Move _get_row and _get_block_row_index into Dirstate itself.
    ------------------------------------------------------------
    revno: 2255.2.65
    merged: john at arbash-meinel.com-20070215202429-gouwaqj9541v25wf
    parent: john at arbash-meinel.com-20070215193713-z5sdz6594q7isee0
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 14:24:29 -0600
    message:
      override path2id because it should be optimized anyway
      and fix some double encoding and missed encoding bugs
      now \.tree_implementations.*test_test all passes
    ------------------------------------------------------------
    revno: 2255.2.64
    merged: john at arbash-meinel.com-20070215193713-z5sdz6594q7isee0
    parent: john at arbash-meinel.com-20070215183224-grz0nmma8kve7go0
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 13:37:13 -0600
    message:
      Add the DirStateRevisionTree to the list of 'tree_implementations'
      Start fixing some tests by just locking the tree before testing.
    ------------------------------------------------------------
    revno: 2255.2.63
    merged: john at arbash-meinel.com-20070215183224-grz0nmma8kve7go0
    parent: john at arbash-meinel.com-20070215175900-28ukh0bwk1lnv1qq
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 12:32:24 -0600
    message:
      track down a couple other places where we are using list_files.
    ------------------------------------------------------------
    revno: 2255.2.62
    merged: john at arbash-meinel.com-20070215175900-28ukh0bwk1lnv1qq
    parent: john at arbash-meinel.com-20070215175610-171tue5qcl4zm6vf
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 11:59:00 -0600
    message:
      add a workingtree_implementations test that makes sure smart_add_tree orks properly
      and fix smart_add_tree to ensure that it takes out a lock_tree_write()
    ------------------------------------------------------------
    revno: 2255.2.61
    merged: john at arbash-meinel.com-20070215175610-171tue5qcl4zm6vf
    parent: john at arbash-meinel.com-20070215171830-7xzy2cxja9g6vclm
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 11:56:10 -0600
    message:
      Find callers of list_files() and make sure the tree is always locked.
    ------------------------------------------------------------
    revno: 2255.2.60
    merged: john at arbash-meinel.com-20070215171830-7xzy2cxja9g6vclm
    parent: robertc at robertcollins.net-20070215100815-sh7ng5cpouingmzz
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 11:18:30 -0600
    message:
      Add an explicit exception since tree.list_files() requires a lock (at least for dirstate
    ------------------------------------------------------------
    revno: 2255.2.59
    merged: robertc at robertcollins.net-20070215100815-sh7ng5cpouingmzz
    parent: robertc at robertcollins.net-20070214222504-fu4k745u7lznoh08
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 21:08:15 +1100
    message:
      All WorkingTree4 and dirstate tests passing.
    ------------------------------------------------------------
    revno: 2255.2.58
    merged: robertc at robertcollins.net-20070214222504-fu4k745u7lznoh08
    parent: robertc at robertcollins.net-20070214221641-41crm4kbh5js20bw
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 09:25:04 +1100
    message:
      Fix the way we used osutils.normalized_filename in dirstate to support overriding in tests - and document this in the original location it was used.
    ------------------------------------------------------------
    revno: 2255.2.57
    merged: robertc at robertcollins.net-20070214221641-41crm4kbh5js20bw
    parent: robertc at robertcollins.net-20070214221212-ow4z8jo4pwyisa0s
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 09:16:41 +1100
    message:
      Dirstate test change: TestWorkingTree.test_rename_dirs should lock around accessing the trees inventory.
    ------------------------------------------------------------
    revno: 2255.2.56
    merged: robertc at robertcollins.net-20070214221212-ow4z8jo4pwyisa0s
    parent: john at arbash-meinel.com-20070214220734-2ekcmk21rhm2z5dw
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 09:12:12 +1100
    message:
      Dirstate: bring set_last_revision into line with the tested API.
    ------------------------------------------------------------
    revno: 2255.2.55
    merged: john at arbash-meinel.com-20070214220734-2ekcmk21rhm2z5dw
    parent: robertc at robertcollins.net-20070214215125-ugt6gf11ywavs2y1
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 16:07:34 -0600
    message:
      add extra flush() call to make _update_tree work for dirstate.
    ------------------------------------------------------------
    revno: 2255.2.54
    merged: robertc at robertcollins.net-20070214215125-ugt6gf11ywavs2y1
    parent: robertc at robertcollins.net-20070214205005-e5gw6c0rnuertm3s
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 08:51:25 +1100
    message:
      Add in non-normalized filename sanity check to dirstate add().
    ------------------------------------------------------------
    revno: 2255.2.53
    merged: robertc at robertcollins.net-20070214205005-e5gw6c0rnuertm3s
    parent: robertc at robertcollins.net-20070214203333-kt6kfmyz5eum5q2s
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 07:50:05 +1100
    message:
      Teach TreeTransform to lock basis_trees if it acquires them, fixing revert on a dirstate working tree.
    ------------------------------------------------------------
    revno: 2255.2.52
    merged: robertc at robertcollins.net-20070214203333-kt6kfmyz5eum5q2s
    parent: john at arbash-meinel.com-20070214201536-eo2cnbwo3bh1tu9v
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Thu 2007-02-15 07:33:33 +1100
    message:
      Dirstate - fix workingtree.list_files to use the public interface to access the trees inventory.
    ------------------------------------------------------------
    revno: 2255.2.51
    merged: john at arbash-meinel.com-20070214201536-eo2cnbwo3bh1tu9v
    parent: john at arbash-meinel.com-20070214201327-16eleapizxjo7vm6
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 14:15:36 -0600
    message:
      simple rewrap for 79 char lines
    ------------------------------------------------------------
    revno: 2255.2.50
    merged: john at arbash-meinel.com-20070214201327-16eleapizxjo7vm6
    parent: john at arbash-meinel.com-20070214200940-s84qp76syr3kywlt
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 14:13:27 -0600
    message:
      merge only needs a lock_tree_write() on the working tree, not a full lock_write()
    ------------------------------------------------------------
    revno: 2255.2.49
    merged: john at arbash-meinel.com-20070214200940-s84qp76syr3kywlt
    parent: jw+debian at jameswestby.net-20070214192716-dto5wr6vv56osswj
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 14:09:40 -0600
    message:
      set_state_from_inventory needs to include NULL records for parents when there wasn't an entry before
    ------------------------------------------------------------
    revno: 2255.2.48
    merged: jw+debian at jameswestby.net-20070214192716-dto5wr6vv56osswj
    parent: robertc at robertcollins.net-20070214100748-wyhniu27ko2l7z8j
    committer: James Westby <jw+debian at jameswestby.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 19:27:16 +0000
    message:
      Write out a placeholder for parent info when a file is added.
      
        * When a file is added it's parent information is not known, but it is
          required to be in the file.
        * There is a problem with this fix though, as if the file is read in
          and then written back out this information will be filtered out and lost.
        * Test case for seeing the problem is
          test_clone_preserves_content.\*WorkingTreeFormat4
    ------------------------------------------------------------
    revno: 2255.2.47
    merged: robertc at robertcollins.net-20070214100748-wyhniu27ko2l7z8j
    parent: robertc at robertcollins.net-20070214095222-tj115lpmfiy3htvq
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 21:07:48 +1100
    message:
      Adjust walkdirs tests to talk a lock around walk_dirs.
    ------------------------------------------------------------
    revno: 2255.2.46
    merged: robertc at robertcollins.net-20070214095222-tj115lpmfiy3htvq
    parent: robertc at robertcollins.net-20070214093211-hwsla8ly0tfycav4
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 20:52:22 +1100
    message:
      Dirstate - unversion should set the tree state as dirty.
    ------------------------------------------------------------
    revno: 2255.2.45
    merged: robertc at robertcollins.net-20070214093211-hwsla8ly0tfycav4
    parent: robertc at robertcollins.net-20070214090400-907zspzmm0dic4wh
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 20:32:11 +1100
    message:
      Dirstate - fix revision_tree() behaviour to match the interface contract.
    ------------------------------------------------------------
    revno: 2255.2.44
    merged: robertc at robertcollins.net-20070214090400-907zspzmm0dic4wh
    parent: robertc at robertcollins.net-20070214064814-723gt18wj42pxj54
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 20:04:00 +1100
    message:
      Fix tree unlock on readonly Format4 trees with dirty hashcache.
    ------------------------------------------------------------
    revno: 2255.2.43
    merged: robertc at robertcollins.net-20070214064814-723gt18wj42pxj54
    parent: robertc at robertcollins.net-20070214062537-inmwv4a1bx2asgs1
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 17:48:14 +1100
    message:
      WorkingTree4.add must not require a file to exist to add it when kind etc is given.
    ------------------------------------------------------------
    revno: 2255.2.42
    merged: robertc at robertcollins.net-20070214062537-inmwv4a1bx2asgs1
    parent: robertc at robertcollins.net-20070214062034-o6mom1aj7j313if6
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 17:25:37 +1100
    message:
      Fix WorkingTree4.set_parent_trees.
    ------------------------------------------------------------
    revno: 2255.2.41
    merged: robertc at robertcollins.net-20070214062034-o6mom1aj7j313if6
    parent: robertc at robertcollins.net-20070214061315-2dvvt300ok9119x0
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 17:20:34 +1100
    message:
      Fix Dirstate.get_parent_ids to return a copy of the ids, not a list whose mutation will break us.
    ------------------------------------------------------------
    revno: 2255.2.40
    merged: robertc at robertcollins.net-20070214061315-2dvvt300ok9119x0
    parent: robertc at robertcollins.net-20070214054023-yq9exvslp2ww0nwy
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 17:13:15 +1100
    message:
      Remove incomplete and unused dirstate api add_parent_tree.
    ------------------------------------------------------------
    revno: 2255.2.39
    merged: robertc at robertcollins.net-20070214054023-yq9exvslp2ww0nwy
    parent: robertc at robertcollins.net-20070214053253-6m06wl1s9kiw0qcv
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 16:40:23 +1100
    message:
      WorkingTree4: flush can only be used during write locks.
    ------------------------------------------------------------
    revno: 2255.2.38
    merged: robertc at robertcollins.net-20070214053253-6m06wl1s9kiw0qcv
    parent: robertc at robertcollins.net-20070214051339-kio8v4q522dcczm3
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 16:32:53 +1100
    message:
      Fix WorkingTree4.pull to work.
    ------------------------------------------------------------
    revno: 2255.2.37
    merged: robertc at robertcollins.net-20070214051339-kio8v4q522dcczm3
    parent: robertc at robertcollins.net-20070214042212-mx6vagld7pedmyfw
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 16:13:39 +1100
    message:
      Get TestExecutable.test_06_pull working on DirState: fix cloning and the set_last_revision api on WorkingTree4.
    ------------------------------------------------------------
    revno: 2255.2.36
    merged: robertc at robertcollins.net-20070214042212-mx6vagld7pedmyfw
    parent: robertc at robertcollins.net-20070214034605-wwq4di8g2nsbp8ni
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 15:22:12 +1100
    message:
      Fix Dirstate unversioning of entries which are in a parent.
    ------------------------------------------------------------
    revno: 2255.2.35
    merged: robertc at robertcollins.net-20070214034605-wwq4di8g2nsbp8ni
    parent: robertc at robertcollins.net-20070214031748-u6cmsmmerm0zdqfh
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 14:46:05 +1100
    message:
      Remove inappropriate use of inventory in tree executability tests. The inventory is not the authoritative source of executability.
    ------------------------------------------------------------
    revno: 2255.2.34
    merged: robertc at robertcollins.net-20070214031748-u6cmsmmerm0zdqfh
    parent: robertc at robertcollins.net-20070214023735-cj9eimb7jkccho6i
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 14:17:48 +1100
    message:
      Fix WorkingTree4 parent_ids logic to use the dirstate to answer parent ids list queries.
    ------------------------------------------------------------
    revno: 2255.2.33
    merged: robertc at robertcollins.net-20070214023735-cj9eimb7jkccho6i
    parent: robertc at robertcollins.net-20070214003125-9k98ublv24yghhb1
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 13:37:35 +1100
    message:
      Correct thunko in refactoring a few commits back.
    ------------------------------------------------------------
    revno: 2255.2.32
    merged: robertc at robertcollins.net-20070214003125-9k98ublv24yghhb1
    parent: robertc at robertcollins.net-20070213225854-eiul6077abs31bxe
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 11:31:25 +1100
    message:
      Make test_clear_merge_conflicts pass for dirstate. This involved working
      around an apparent race condition with file.truncate not truncating - the
      dirstate file shrinks but later readers see the old file length and
      content.
    ------------------------------------------------------------
    revno: 2255.2.31
    merged: robertc at robertcollins.net-20070213225854-eiul6077abs31bxe
    parent: robertc at robertcollins.net-20070213222322-48liwrvbanmvlc24
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 09:58:54 +1100
    message:
      Work in progress to make merge_inner work with dirstate trees.
    ------------------------------------------------------------
    revno: 2255.2.30
    merged: robertc at robertcollins.net-20070213222322-48liwrvbanmvlc24
    parent: robertc at robertcollins.net-20070213220121-xqmcyci92igsufix
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 09:23:22 +1100
    message:
      Some workingtree_implementations/test_workingtree.py test work - add DirStateRevisionTree.has_filename, locks around appropriate calls in tests.
    ------------------------------------------------------------
    revno: 2255.2.29
    merged: robertc at robertcollins.net-20070213220121-xqmcyci92igsufix
    parent: robertc at robertcollins.net-20070213215415-6mq85vvc26ia5xgi
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 09:01:21 +1100
    message:
      Change the error raised from Dirstate.add for an unversioned parent path to match the WorkingTree interface.
    ------------------------------------------------------------
    revno: 2255.2.28
    merged: robertc at robertcollins.net-20070213215415-6mq85vvc26ia5xgi
    parent: john at arbash-meinel.com-20070213214821-kixuzfqak8kh72hx
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Wed 2007-02-14 08:54:15 +1100
    message:
      TestWorkingTree.test__write_inventory needs to lock the tree before calling _write_inventory for dirstate.
    ------------------------------------------------------------
    revno: 2255.2.27
    merged: john at arbash-meinel.com-20070213214821-kixuzfqak8kh72hx
    parent: john at arbash-meinel.com-20070213214527-ldycawt3gusmy0nn
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Tue 2007-02-13 15:48:21 -0600
    message:
      Fix a copyright statement to let 'source' tests pass
    ------------------------------------------------------------
    revno: 2255.2.26
    merged: john at arbash-meinel.com-20070213214527-ldycawt3gusmy0nn
    parent: john at arbash-meinel.com-20070213213438-ckxvudqmy5sa6pmu
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Tue 2007-02-13 15:45:27 -0600
    message:
      Use a clearer variable for num_present_parents while reading dirblocks
    ------------------------------------------------------------
    revno: 2255.2.25
    merged: john at arbash-meinel.com-20070213213438-ckxvudqmy5sa6pmu
    parent: john at arbash-meinel.com-20070213213402-05v5g7g3bsbrxb3p
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Tue 2007-02-13 15:34:38 -0600
    message:
      DirstateRevisionTrees need to be read_locked before they will work as BasisTree
    ------------------------------------------------------------
    revno: 2255.2.24
    merged: john at arbash-meinel.com-20070213213402-05v5g7g3bsbrxb3p
    parent: john at arbash-meinel.com-20070213210556-zw42d3te8rv50hct
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Tue 2007-02-13 15:34:02 -0600
    message:
      When adding ghosts revision_tree() raises RevisionNotPresent because of Knit, not NoSuchRevision
    ------------------------------------------------------------
    revno: 2255.2.23
    merged: john at arbash-meinel.com-20070213210556-zw42d3te8rv50hct
    parent: robertc at robertcollins.net-20070213111943-atz18s4v89dn3hkk
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Tue 2007-02-13 15:05:56 -0600
    message:
      When parsing the contents, ghosts are not records, so should not be included in the line parsing.
    ------------------------------------------------------------
    revno: 2255.2.22
    merged: robertc at robertcollins.net-20070213111943-atz18s4v89dn3hkk
    parent: robertc at robertcollins.net-20070213074405-cr50y24l7n7fon56
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Tue 2007-02-13 22:19:43 +1100
    message:
      Dirstate: implement WorkingTree4.unversion, letting some test_commit tests pass.
    ------------------------------------------------------------
    revno: 2255.2.21
    merged: robertc at robertcollins.net-20070213074405-cr50y24l7n7fon56
    parent: robertc at robertcollins.net-20070213061520-3ga0hywdijgr8fxg
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Tue 2007-02-13 18:44:05 +1100
    message:
      Add WorkingTree4._last_revision, making workingtree_implementations.test_changes_from pass.
    ------------------------------------------------------------
    revno: 2255.2.20
    merged: robertc at robertcollins.net-20070213061520-3ga0hywdijgr8fxg
    parent: robertc at robertcollins.net-20070213055402-vn9c5sctppi2wanj
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Tue 2007-02-13 17:15:20 +1100
    message:
      Bypass irrelevant basis_inventory tests for dirstate.
    ------------------------------------------------------------
    revno: 2255.2.19
    merged: robertc at robertcollins.net-20070213055402-vn9c5sctppi2wanj
    parent: robertc at robertcollins.net-20070213053056-ypqby2efbram4k53
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Tue 2007-02-13 16:54:02 +1100
    message:
      Remove unneeded and unportable WorkingTree basis-inventory test 
      'test_basis_inv_gets_revision' which checks that when we
      set a parent tree in a working tree with an inventory with no
      revision_id, the revision_id is correctly stored.
      
      However, Repository.deserialise_inventory always sets the revision_id
      (for Knit1) and ensures its there (for Knit2).
    ------------------------------------------------------------
    revno: 2255.2.18
    merged: robertc at robertcollins.net-20070213053056-ypqby2efbram4k53
    parent: robertc at robertcollins.net-20070213042134-typgrsy56uftta7x
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Tue 2007-02-13 16:30:56 +1100
    message:
      Dirstate: all tree_implementation tests passing.
    ------------------------------------------------------------
    revno: 2255.2.17
    merged: robertc at robertcollins.net-20070213042134-typgrsy56uftta7x
    parent: robertc at robertcollins.net-20070213040523-hmubxccedv85k967
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Tue 2007-02-13 15:21:34 +1100
    message:
      tweaks - finishes off all the test_test_trees tests for dirstate.
    ------------------------------------------------------------
    revno: 2255.2.16
    merged: robertc at robertcollins.net-20070213040523-hmubxccedv85k967
    parent: robertc at robertcollins.net-20070213014233-9jtxnsrljncqdtgt
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Tue 2007-02-13 15:05:23 +1100
    message:
      Implement WorkingTreeFormat4._write_inventory for better compatability with existing code, letting more test_test_trees pass, now up to test_tree_with_subdirs_and_all_content_types.
    ------------------------------------------------------------
    revno: 2255.2.15
    merged: robertc at robertcollins.net-20070213014233-9jtxnsrljncqdtgt
    parent: robertc at robertcollins.net-20070212230308-yvh5jufj1dng75wm
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Tue 2007-02-13 12:42:33 +1100
    message:
      Dirstate - truncate state file fixing bug in saving a smaller file, get more tree_implementation tests passing.
    ------------------------------------------------------------
    revno: 2255.2.14
    merged: robertc at robertcollins.net-20070212230308-yvh5jufj1dng75wm
    parent: robertc at robertcollins.net-20070212223329-275infbfdfv1d24d
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Tue 2007-02-13 10:03:08 +1100
    message:
      Dirstate: fix adding of directories to setup the next directories block, and test representation of symlinks. Also fix iter_rows to not reset the dirty bit.
    ------------------------------------------------------------
    revno: 2255.2.13
    merged: robertc at robertcollins.net-20070212223329-275infbfdfv1d24d
    parent: robertc at robertcollins.net-20070212122016-09nzj20fdc5a7olk
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Tue 2007-02-13 09:33:29 +1100
    message:
      Test adding of directories to the root of a dirstate.
    ------------------------------------------------------------
    revno: 2255.2.12
    merged: robertc at robertcollins.net-20070212122016-09nzj20fdc5a7olk
    parent: robertc at robertcollins.net-20070212092321-1zbfcmcg58o5fwwc
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-12 23:20:16 +1100
    message:
      Partial implementation of WorkingTree4._add.
    ------------------------------------------------------------
    revno: 2255.2.11
    merged: robertc at robertcollins.net-20070212092321-1zbfcmcg58o5fwwc
    parent: robertc at robertcollins.net-20070212090246-p4c9wjssp07jmrj7
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-12 20:23:21 +1100
    message:
      Fix the format 4 tree layout test.
    ------------------------------------------------------------
    revno: 2255.2.10
    merged: robertc at robertcollins.net-20070212090246-p4c9wjssp07jmrj7
    parent: robertc at robertcollins.net-20070212050917-gq1g6szx07seanfr
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-12 20:02:46 +1100
    message:
      Now all tests matching dirstate pass - added generation of inventories for parent trees.
    ------------------------------------------------------------
    revno: 2255.2.9
    merged: robertc at robertcollins.net-20070212050917-gq1g6szx07seanfr
    parent: robertc at robertcollins.net-20070212021844-o0olslhyd0e675jc
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-12 16:09:17 +1100
    message:
      Dirstate: Fix setting of parent trees to record data about entries not in
      the current tree, and fix serialisation and deserialisation to correctly
      save and retrieve all entries and parents.
    ------------------------------------------------------------
    revno: 2255.2.8
    merged: robertc at robertcollins.net-20070212021844-o0olslhyd0e675jc
    parent: robertc at robertcollins.net-20070212011000-ow0mqc9fpayx7ugz
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-12 13:18:44 +1100
    message:
      First DirState.add() method test passing.
    ------------------------------------------------------------
    revno: 2255.2.7
    merged: robertc at robertcollins.net-20070212011000-ow0mqc9fpayx7ugz
    parent: robertc at robertcollins.net-20070212010052-o042kqo4bqwb5s16
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-12 12:10:00 +1100
    message:
      test_set_parent_trees_no_content dirstate test now passing.
    ------------------------------------------------------------
    revno: 2255.2.6
    merged: robertc at robertcollins.net-20070212010052-o042kqo4bqwb5s16
    parent: robertc at robertcollins.net-20070212003219-534i22hhko16tf5f
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-12 12:00:52 +1100
    message:
      Correct row updates during DirState.set_parent_trees.
    ------------------------------------------------------------
    revno: 2255.2.5
    merged: robertc at robertcollins.net-20070212003219-534i22hhko16tf5f
    parent: robertc at robertcollins.net-20070209065559-snwodn5i9mu8om4w
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Mon 2007-02-12 11:32:19 +1100
    message:
      Fix getting two different tree roots in the set_parent_trees_no_content dirstate test.
    ------------------------------------------------------------
    revno: 2255.2.4
    merged: robertc at robertcollins.net-20070209065559-snwodn5i9mu8om4w
    parent: robertc at robertcollins.net-20070208204707-e1uhlli4t3ozgeil
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Fri 2007-02-09 17:55:59 +1100
    message:
      Snapshot dirstate development
    ------------------------------------------------------------
    revno: 2255.2.3
    merged: robertc at robertcollins.net-20070208204707-e1uhlli4t3ozgeil
    parent: robertc at robertcollins.net-20070208001102-k5hy63o7om2amnp1
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Fri 2007-02-09 07:47:07 +1100
    message:
      Split out working tree format 4 to its own file, create stub dirstate revision object, start working on dirstate.set_parent_trees - a key failure point.
    ------------------------------------------------------------
    revno: 2255.2.2
    merged: robertc at robertcollins.net-20070208001102-k5hy63o7om2amnp1
    parent: john at arbash-meinel.com-20070202050035-v072pvir8vspmqk8
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: dirstate
    timestamp: Thu 2007-02-08 11:11:02 +1100
    message:
      Partial updates for API changes in trunk.
    ------------------------------------------------------------
    revno: 2255.2.1
    merged: john at arbash-meinel.com-20070202050035-v072pvir8vspmqk8
    parent: pqm at pqm.ubuntu.com-20070201235951-11ed96907aa6bce4
    parent: john at arbash-meinel.com-20070202045609-vzev8vz6xwf3zu3e
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: dirstate
    timestamp: Thu 2007-02-01 23:00:35 -0600
    message:
      Update a clean branch with the dirstate improvements.
    ------------------------------------------------------------
    revno: 1852.4.26
    merged: john at arbash-meinel.com-20070202045609-vzev8vz6xwf3zu3e
    parent: robertc at robertcollins.net-20061208031936-be473da3cbfb05da
    parent: john at arbash-meinel.com-20070202045526-v922kbu7b82dadrd
    committer: John Arbash Meinel <john at arbash-meinel.com>
    branch nick: WorkingTreeFormat4 as the default tree format.
    timestamp: Thu 2007-02-01 22:56:09 -0600
    message:
      [merge] bzr.dev 2255
        ------------------------------------------------------------
        revno: 1852.4.24.1.1
        merged: john at arbash-meinel.com-20070202045526-v922kbu7b82dadrd
        parent: robertc at robertcollins.net-20061016022012-cb1d5e37571785d7
        parent: john at arbash-meinel.com-20070202045348-vwe1bp6mf40nk6dg
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: WorkingTree Format 4
        timestamp: Thu 2007-02-01 22:55:26 -0600
        message:
          [merge] bzr.dev 2255
        ------------------------------------------------------------
        revno: 1852.3.1.1.2.1.3.1.8
        merged: john at arbash-meinel.com-20070202045348-vwe1bp6mf40nk6dg
        parent: robertc at robertcollins.net-20061006003850-31476149984a1a02
        parent: john at arbash-meinel.com-20070202045148-uwuuiy0hr7gx51gb
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: status-benchmarks
        timestamp: Thu 2007-02-01 22:53:48 -0600
        message:
          [merge] bzr.dev 2255
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.19
        merged: john at arbash-meinel.com-20070202045148-uwuuiy0hr7gx51gb
        parent: robertc at robertcollins.net-20061006003734-c1f35733490cb427
        parent: john at arbash-meinel.com-20070202044938-6c04umlv9y4j2tz1
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: test_write_inventory
        timestamp: Thu 2007-02-01 22:51:48 -0600
        message:
          [merge] bzr.dev 2255
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.13.1.5
        merged: john at arbash-meinel.com-20070202044938-6c04umlv9y4j2tz1
        parent: robertc at robertcollins.net-20061006003453-c840b2008705450b
        parent: john at arbash-meinel.com-20070202042324-n50b1g3l37mlj86k
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: Tree.walkdirs
        timestamp: Thu 2007-02-01 22:49:38 -0600
        message:
          [merge] bzr.dev 2255, resolve conflicts, update copyrights
        ------------------------------------------------------------
        revno: 1908.4.2.1.4.1.10.1.7
        merged: john at arbash-meinel.com-20070202042324-n50b1g3l37mlj86k
        parent: john at arbash-meinel.com-20070119000112-z1edp8yw6w8fs6lb
        parent: pqm at pqm.ubuntu.com-20070201235951-11ed96907aa6bce4
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: tree-revision-tree.
        timestamp: Thu 2007-02-01 22:23:24 -0600
        message:
          [merge] bzr.dev 2255
        ------------------------------------------------------------
        revno: 1908.4.2.1.4.1.10.1.6
        merged: john at arbash-meinel.com-20070119000112-z1edp8yw6w8fs6lb
        parent: john at arbash-meinel.com-20070118234524-qrahqbck710p1n9e
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: tree-revision-tree.
        timestamp: Thu 2007-01-18 18:01:12 -0600
        message:
          Fix an invalid access to bzrlib.xml6 in workingtree.py
        ------------------------------------------------------------
        revno: 1908.4.2.1.4.1.10.1.5
        merged: john at arbash-meinel.com-20070118234524-qrahqbck710p1n9e
        parent: robertc at robertcollins.net-20061006003341-120d1a0bcd585947
        parent: pqm at pqm.ubuntu.com-20070117184107-a6267599a6b636f1
        committer: John Arbash Meinel <john at arbash-meinel.com>
        branch nick: tree-revision-tree.
        timestamp: Thu 2007-01-18 17:45:24 -0600
        message:
          [merge] bzr.dev 2240
    ------------------------------------------------------------
    revno: 1852.4.25
    merged: robertc at robertcollins.net-20061208031936-be473da3cbfb05da
    parent: robertc at robertcollins.net-20061016022012-cb1d5e37571785d7
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTreeFormat4 as the default tree format.
    timestamp: Fri 2006-12-08 14:19:36 +1100
    message:
      Snapshot state
    ------------------------------------------------------------
    revno: 1852.4.24
    merged: robertc at robertcollins.net-20061016022012-cb1d5e37571785d7
    parent: robertc at robertcollins.net-20061006004127-715d9f3de836f2bd
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Mon 2006-10-16 12:20:12 +1000
    message:
      Get back to the broken-pending-revision-tree-from-dirstate state of development, changing dirstate from_tree to use _set_data rather than generating lines itself.
    ------------------------------------------------------------
    revno: 1852.4.23
    merged: robertc at robertcollins.net-20061006004127-715d9f3de836f2bd
    parent: robertc at robertcollins.net-20061004033750-4d699c8f4894538b
    parent: robertc at robertcollins.net-20061006003850-31476149984a1a02
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Fri 2006-10-06 10:41:27 +1000
    message:
      Merge up.
        ------------------------------------------------------------
        revno: 1852.3.1.1.2.1.3.1.7
        merged: robertc at robertcollins.net-20061006003850-31476149984a1a02
        parent: robertc at robertcollins.net-20061004033344-1ad19cbc27ee55e6
        parent: robertc at robertcollins.net-20061006003734-c1f35733490cb427
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: status-benchmarks
        timestamp: Fri 2006-10-06 10:38:50 +1000
        message:
          Merge up.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.18
        merged: robertc at robertcollins.net-20061006003734-c1f35733490cb427
        parent: robertc at robertcollins.net-20061004021235-9bb63acdb6862481
        parent: robertc at robertcollins.net-20061006003453-c840b2008705450b
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: test_write_inventory
        timestamp: Fri 2006-10-06 10:37:34 +1000
        message:
          Merge up.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.13.1.4
        merged: robertc at robertcollins.net-20061006003453-c840b2008705450b
        parent: robertc at robertcollins.net-20061004015639-3ded16fe4823228f
        parent: robertc at robertcollins.net-20061006003341-120d1a0bcd585947
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Tree.walkdirs
        timestamp: Fri 2006-10-06 10:34:53 +1000
        message:
          Merge up.
        ------------------------------------------------------------
        revno: 1908.4.2.1.4.1.10.1.4
        merged: robertc at robertcollins.net-20061006003341-120d1a0bcd585947
        parent: robertc at robertcollins.net-20061004014835-764aa46abec8451b
        parent: robertc at robertcollins.net-20061006003100-2ef87a9af77db232
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: tree-revision-tree.
        timestamp: Fri 2006-10-06 10:33:41 +1000
        message:
          Merge up.
    ------------------------------------------------------------
    revno: 1852.4.22
    merged: robertc at robertcollins.net-20061004033750-4d699c8f4894538b
    parent: robertc at robertcollins.net-20061004013838-46aab91d89bdeaba
    parent: robertc at robertcollins.net-20061004033344-1ad19cbc27ee55e6
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Wed 2006-10-04 13:37:50 +1000
    message:
      Merge bzr.dev.
        ------------------------------------------------------------
        revno: 1852.3.1.1.2.1.3.1.6
        merged: robertc at robertcollins.net-20061004033344-1ad19cbc27ee55e6
        parent: robertc at robertcollins.net-20060908043058-bf14bde0832b8106
        parent: robertc at robertcollins.net-20061004021235-9bb63acdb6862481
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: status-benchmarks
        timestamp: Wed 2006-10-04 13:33:44 +1000
        message:
          merge bzr.dev.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.17
        merged: robertc at robertcollins.net-20061004021235-9bb63acdb6862481
        parent: robertc at robertcollins.net-20060908043020-c1b36a0d6637df8c
        parent: robertc at robertcollins.net-20061004015639-3ded16fe4823228f
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: test_write_inventory
        timestamp: Wed 2006-10-04 12:12:35 +1000
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.13.1.3
        merged: robertc at robertcollins.net-20061004015639-3ded16fe4823228f
        parent: robertc at robertcollins.net-20060908042801-d94734fddf427c8c
        parent: robertc at robertcollins.net-20061004014835-764aa46abec8451b
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Tree.walkdirs
        timestamp: Wed 2006-10-04 11:56:39 +1000
        message:
          Merge bzr.dev
        ------------------------------------------------------------
        revno: 1908.4.2.1.4.1.10.1.3
        merged: robertc at robertcollins.net-20061004014835-764aa46abec8451b
        parent: robertc at robertcollins.net-20060908042058-af4fe4c3b2424159
        parent: pqm at pqm.ubuntu.com-20061002004310-6e09ddd7fd28f71c
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: tree-revision-tree.
        timestamp: Wed 2006-10-04 11:48:35 +1000
        message:
          Merge bzr.dev
    ------------------------------------------------------------
    revno: 1852.4.21
    merged: robertc at robertcollins.net-20061004013838-46aab91d89bdeaba
    parent: robertc at robertcollins.net-20060913034346-a7d52474ae6a92b2
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Wed 2006-10-04 11:38:38 +1000
    message:
      (Robert Collins, John Meinel) Update WorkingTree Format 4 format string to be nicer to read.
    ------------------------------------------------------------
    revno: 1852.4.20
    merged: robertc at robertcollins.net-20060913034346-a7d52474ae6a92b2
    parent: robertc at robertcollins.net-20060911053648-844ee65e1679e4d3
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Wed 2006-09-13 13:43:46 +1000
    message:
      Steps toward an object model.
    ------------------------------------------------------------
    revno: 1852.4.19
    merged: robertc at robertcollins.net-20060911053648-844ee65e1679e4d3
    parent: robertc at robertcollins.net-20060908055725-5c942a7017713c1e
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Mon 2006-09-11 15:36:48 +1000
    message:
      Get DirState objects roundtripping an add of a ghost tree.
    ------------------------------------------------------------
    revno: 1852.4.18
    merged: robertc at robertcollins.net-20060908055725-5c942a7017713c1e
    parent: robertc at robertcollins.net-20060908043301-2c684fb0c58addfd
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Fri 2006-09-08 15:57:25 +1000
    message:
      Write top level acceptance test for dirstate.
    ------------------------------------------------------------
    revno: 1852.4.17
    merged: robertc at robertcollins.net-20060908043301-2c684fb0c58addfd
    parent: robertc at robertcollins.net-20060807071928-74ad46010d48d12b
    parent: robertc at robertcollins.net-20060908043058-bf14bde0832b8106
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Fri 2006-09-08 14:33:01 +1000
    message:
      Merge bzr.dev.
        ------------------------------------------------------------
        revno: 1852.3.1.1.2.1.3.1.5
        merged: robertc at robertcollins.net-20060908043058-bf14bde0832b8106
        parent: robertc at robertcollins.net-20060807071919-55f84e1160fe3fd9
        parent: robertc at robertcollins.net-20060908043020-c1b36a0d6637df8c
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: status-benchmarks
        timestamp: Fri 2006-09-08 14:30:58 +1000
        message:
          Merge bzr.dev.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.16
        merged: robertc at robertcollins.net-20060908043020-c1b36a0d6637df8c
        parent: robertc at robertcollins.net-20060807071910-3b85bee9d1dc5f1d
        parent: robertc at robertcollins.net-20060908042801-d94734fddf427c8c
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: test_write_inventory
        timestamp: Fri 2006-09-08 14:30:20 +1000
        message:
          Merge bzr.dev.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.13.1.2
        merged: robertc at robertcollins.net-20060908042801-d94734fddf427c8c
        parent: robertc at robertcollins.net-20060807071855-f00931a4a0fb8ab1
        parent: robertc at robertcollins.net-20060908042058-af4fe4c3b2424159
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Tree.walkdirs
        timestamp: Fri 2006-09-08 14:28:01 +1000
        message:
          Merge bzr.dev.
        ------------------------------------------------------------
        revno: 1908.4.2.1.4.1.10.1.2
        merged: robertc at robertcollins.net-20060908042058-af4fe4c3b2424159
        parent: robertc at robertcollins.net-20060908015847-69da178f0ec194d4
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: tree-revision-tree.
        timestamp: Fri 2006-09-08 14:20:58 +1000
        message:
          Implement WorkingTree interface conformance tests for
          WorkingTree.revision_tree. As part of this, refactor the basis_tree method
          to use revision_tree to access the cached basis inventory.
          (Robert Collins, Martin Pool)
        ------------------------------------------------------------
        revno: 1908.4.2.1.4.1.10.1.1
        merged: robertc at robertcollins.net-20060908015847-69da178f0ec194d4
        parent: robertc at robertcollins.net-20060905234449-baeb0612c8847493
        parent: pqm at pqm.ubuntu.com-20060908003811-74eab872c372a895
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: tree-revision-tree.
        timestamp: Fri 2006-09-08 11:58:47 +1000
        message:
          Add a new method ``Tree.revision_tree`` which allows access to cached
          trees for arbitrary revisions. This allows the in development dirstate
          tree format to provide access to the callers to cached copies of 
          inventory data which are cheaper to access than inventories from the
          repository. (Robert Collins, Martin Pool)
    ------------------------------------------------------------
    revno: 1852.4.16
    merged: robertc at robertcollins.net-20060807071928-74ad46010d48d12b
    parent: robertc at robertcollins.net-20060802081150-6041cc7808a58320
    parent: robertc at robertcollins.net-20060807071919-55f84e1160fe3fd9
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Mon 2006-08-07 17:19:28 +1000
    message:
      Merge bzr.dev.
        ------------------------------------------------------------
        revno: 1852.3.1.1.2.1.3.1.4
        merged: robertc at robertcollins.net-20060807071919-55f84e1160fe3fd9
        parent: robertc at robertcollins.net-20060731134709-61df962ef27379f6
        parent: robertc at robertcollins.net-20060807071910-3b85bee9d1dc5f1d
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: status-benchmarks
        timestamp: Mon 2006-08-07 17:19:19 +1000
        message:
          Merge bzr.dev.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.15
        merged: robertc at robertcollins.net-20060807071910-3b85bee9d1dc5f1d
        parent: robertc at robertcollins.net-20060802054451-8e9360afd2c5e3ac
        parent: robertc at robertcollins.net-20060807071855-f00931a4a0fb8ab1
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: test_write_inventory
        timestamp: Mon 2006-08-07 17:19:10 +1000
        message:
          Merge bzr.dev.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.13.1.1
        merged: robertc at robertcollins.net-20060807071855-f00931a4a0fb8ab1
        parent: robertc at robertcollins.net-20060731134652-f55dff6ba7d6f487
        parent: pqm at pqm.ubuntu.com-20060806235730-876748deb30a3d2d
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Tree.walkdirs
        timestamp: Mon 2006-08-07 17:18:55 +1000
        message:
          Merge bzr.dev.
    ------------------------------------------------------------
    revno: 1852.4.15
    merged: robertc at robertcollins.net-20060802081150-6041cc7808a58320
    parent: robertc at robertcollins.net-20060802055506-06e33be6f0e091e4
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Wed 2006-08-02 18:11:50 +1000
    message:
      Ensure Format4 working trees start with a dirstate.
    ------------------------------------------------------------
    revno: 1852.4.14
    merged: robertc at robertcollins.net-20060802055506-06e33be6f0e091e4
    parent: robertc at robertcollins.net-20060801024856-8d077236a204de35
    parent: robertc at robertcollins.net-20060802054451-8e9360afd2c5e3ac
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Wed 2006-08-02 15:55:06 +1000
    message:
      Merge _write_inventory test.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.14
        merged: robertc at robertcollins.net-20060802054451-8e9360afd2c5e3ac
        parent: robertc at robertcollins.net-20060731134652-f55dff6ba7d6f487
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: test_write_inventory
        timestamp: Wed 2006-08-02 15:44:51 +1000
        message:
          test that WorkingTree._write_inventory works as expected by the current code.
    ------------------------------------------------------------
    revno: 1852.4.13
    merged: robertc at robertcollins.net-20060801024856-8d077236a204de35
    parent: robertc at robertcollins.net-20060801023425-6dcc8fdd1b085e2d
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Tue 2006-08-01 12:48:56 +1000
    message:
      2-parent case working.
    ------------------------------------------------------------
    revno: 1852.4.12
    merged: robertc at robertcollins.net-20060801023425-6dcc8fdd1b085e2d
    parent: robertc at robertcollins.net-20060801021703-aa0b3288c14589eb
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Tue 2006-08-01 12:34:25 +1000
    message:
      get actual parent info for the first parent.
    ------------------------------------------------------------
    revno: 1852.4.11
    merged: robertc at robertcollins.net-20060801021703-aa0b3288c14589eb
    parent: robertc at robertcollins.net-20060801021024-7cb425feb0ba7419
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Tue 2006-08-01 12:17:03 +1000
    message:
      Get one content containing test passing.
    ------------------------------------------------------------
    revno: 1852.4.10
    merged: robertc at robertcollins.net-20060801021024-7cb425feb0ba7419
    parent: robertc at robertcollins.net-20060731134719-456f4027e4284c9b
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Tue 2006-08-01 12:10:24 +1000
    message:
      Use just the tree api to generate dirstate information.
    ------------------------------------------------------------
    revno: 1852.4.9
    merged: robertc at robertcollins.net-20060731134719-456f4027e4284c9b
    parent: robertc at robertcollins.net-20060731130517-e570c5a788f869f3
    parent: robertc at robertcollins.net-20060731134709-61df962ef27379f6
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Mon 2006-07-31 23:47:19 +1000
    message:
      Merge Tree.walkdirs.
        ------------------------------------------------------------
        revno: 1852.3.1.1.2.1.3.1.3
        merged: robertc at robertcollins.net-20060731134709-61df962ef27379f6
        parent: robertc at robertcollins.net-20060731130010-f4c77e39e83f9115
        parent: robertc at robertcollins.net-20060731134652-f55dff6ba7d6f487
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: status-benchmarks
        timestamp: Mon 2006-07-31 23:47:09 +1000
        message:
          Merge Tree.walkdirs.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.13
        merged: robertc at robertcollins.net-20060731134652-f55dff6ba7d6f487
        parent: robertc at robertcollins.net-20060731125718-f9735bc290a6e7a8
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Tree.walkdirs
        timestamp: Mon 2006-07-31 23:46:52 +1000
        message:
          Add WorkingTree.walkdirs benchmarks.
    ------------------------------------------------------------
    revno: 1852.4.8
    merged: robertc at robertcollins.net-20060731130517-e570c5a788f869f3
    parent: robertc at robertcollins.net-20060731130032-26d4961c3721dc8c
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Mon 2006-07-31 23:05:17 +1000
    message:
      get current dirstat tests all passing.
    ------------------------------------------------------------
    revno: 1852.4.7
    merged: robertc at robertcollins.net-20060731130032-26d4961c3721dc8c
    parent: robertc at robertcollins.net-20060728012152-920e80b4f74a062b
    parent: robertc at robertcollins.net-20060731130010-f4c77e39e83f9115
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Mon 2006-07-31 23:00:32 +1000
    message:
      Merge in bzr.dev.
        ------------------------------------------------------------
        revno: 1852.3.1.1.2.1.3.1.2
        merged: robertc at robertcollins.net-20060731130010-f4c77e39e83f9115
        parent: robertc at robertcollins.net-20060727010805-7688cc135ae9dea3
        parent: robertc at robertcollins.net-20060731125718-f9735bc290a6e7a8
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: status-benchmarks
        timestamp: Mon 2006-07-31 23:00:10 +1000
        message:
          Merge in bzr.dev.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.12
        merged: robertc at robertcollins.net-20060731125718-f9735bc290a6e7a8
        parent: robertc at robertcollins.net-20060731111948-ca237e1871bdfb12
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Tree.walkdirs
        timestamp: Mon 2006-07-31 22:57:18 +1000
        message:
          WorkingTree.walkdirs handling of changing file kinds, and multi-directory with missing and unknown ordering bugfix.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.11
        merged: robertc at robertcollins.net-20060731111948-ca237e1871bdfb12
        parent: robertc at robertcollins.net-20060731071854-d1fe7dd1ee353097
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Tree.walkdirs
        timestamp: Mon 2006-07-31 21:19:48 +1000
        message:
          Tree.walkdirs handles missing contents in workingtrees.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.10
        merged: robertc at robertcollins.net-20060731071854-d1fe7dd1ee353097
        parent: robertc at robertcollins.net-20060731045051-41275b0c5a0af8c9
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Tree.walkdirs
        timestamp: Mon 2006-07-31 17:18:54 +1000
        message:
          Tweak the Tree.walkdirs interface more to be more useful.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.9
        merged: robertc at robertcollins.net-20060731045051-41275b0c5a0af8c9
        parent: robertc at robertcollins.net-20060731045034-092027e3f462f644
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Tree.walkdirs
        timestamp: Mon 2006-07-31 14:50:51 +1000
        message:
          Add missing test script.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.8
        merged: robertc at robertcollins.net-20060731045034-092027e3f462f644
        parent: robertc at robertcollins.net-20060731041731-5e25624f04900907
        parent: robertc at robertcollins.net-20060731043747-26893f2e873e7816
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Tree.walkdirs
        timestamp: Mon 2006-07-31 14:50:34 +1000
        message:
          Merge walkdirs tidyup.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.7
        merged: robertc at robertcollins.net-20060731041731-5e25624f04900907
        parent: robertc at robertcollins.net-20060730140917-6bf9286175a4ece3
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Tree.walkdirs
        timestamp: Mon 2006-07-31 14:17:31 +1000
        message:
          Start testing behaviour of unknowns in WorkingTree.walkdirs.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.6
        merged: robertc at robertcollins.net-20060730140917-6bf9286175a4ece3
        parent: robertc at robertcollins.net-20060729160435-1cdb99ebaa681bca
        parent: robertc at robertcollins.net-20060730140221-19d4964ea23f4406
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Tree.walkdirs
        timestamp: Mon 2006-07-31 00:09:17 +1000
        message:
          Merge osutils.walkdirs improvements.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.5
        merged: robertc at robertcollins.net-20060729160435-1cdb99ebaa681bca
        parent: robertc at robertcollins.net-20060729160416-5bd962697605b0f2
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Tree.walkdirs
        timestamp: Sun 2006-07-30 02:04:35 +1000
        message:
          Add missing test_walkdirs test file.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.4
        merged: robertc at robertcollins.net-20060729160416-5bd962697605b0f2
        parent: robertc at robertcollins.net-20060729035749-f4d52d3fcc448fd9
        parent: pqm at pqm.ubuntu.com-20060729144556-473b3c46dfa061a7
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Tree.walkdirs
        timestamp: Sun 2006-07-30 02:04:16 +1000
        message:
          Merge bzr.dev.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.3
        merged: robertc at robertcollins.net-20060729035749-f4d52d3fcc448fd9
        parent: robertc at robertcollins.net-20060729014910-c474aea7fe38093b
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Tree.walkdirs
        timestamp: Sat 2006-07-29 13:57:49 +1000
        message:
          Add a first-cut Tree.walkdirs method.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.2
        merged: robertc at robertcollins.net-20060729014910-c474aea7fe38093b
        parent: robertc at robertcollins.net-20060728090047-d58a4d7c12eee48e
        parent: pqm at pqm.ubuntu.com-20060728165219-3a441adb0af54ef8
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Tree.walkdirs
        timestamp: Sat 2006-07-29 11:49:10 +1000
        message:
          Merge bzr.dev.
        ------------------------------------------------------------
        revno: 1852.3.1.1.4.2.4.1.4.1.1
        merged: robertc at robertcollins.net-20060728090047-d58a4d7c12eee48e
        parent: robertc at robertcollins.net-20060725062142-a8ba77276b76c8cf
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: Tree.walkdirs
        timestamp: Fri 2006-07-28 19:00:47 +1000
        message:
          Add a complex test tree for use with Tree.walkdirs.
    ------------------------------------------------------------
    revno: 1852.4.6
    merged: robertc at robertcollins.net-20060728012152-920e80b4f74a062b
    parent: robertc at robertcollins.net-20060727010824-1574387ff896add8
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Fri 2006-07-28 11:21:52 +1000
    message:
      start hooking in the prototype dirstate serialiser.
    ------------------------------------------------------------
    revno: 1852.4.5
    merged: robertc at robertcollins.net-20060727010824-1574387ff896add8
    parent: robertc at robertcollins.net-20060726074958-2b1c61f0d539fe14
    parent: robertc at robertcollins.net-20060727010805-7688cc135ae9dea3
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Thu 2006-07-27 11:08:24 +1000
    message:
      merge single file status benchmark.
        ------------------------------------------------------------
        revno: 1852.3.1.1.2.1.3.1.1
        merged: robertc at robertcollins.net-20060727010805-7688cc135ae9dea3
        parent: robertc at robertcollins.net-20060726074817-78581226f4efe2ed
        committer: Robert Collins <robertc at robertcollins.net>
        branch nick: status-benchmarks
        timestamp: Thu 2006-07-27 11:08:05 +1000
        message:
          Add single file status benchmark.
    ------------------------------------------------------------
    revno: 1852.4.4
    merged: robertc at robertcollins.net-20060726074958-2b1c61f0d539fe14
    parent: robertc at robertcollins.net-20060717072314-014d66e3c58960ea
    parent: robertc at robertcollins.net-20060726074817-78581226f4efe2ed
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Wed 2006-07-26 17:49:58 +1000
    message:
      Merge Tree.changes_from work.
    ------------------------------------------------------------
    revno: 1852.4.3
    merged: robertc at robertcollins.net-20060717072314-014d66e3c58960ea
    parent: robertc at robertcollins.net-20060714060110-774502f9583b3d1c
    parent: robertc at robertcollins.net-20060717072302-c398045e6dcc577d
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Mon 2006-07-17 17:23:14 +1000
    message:
      Merge bzr.dev.
    ------------------------------------------------------------
    revno: 1852.4.2
    merged: robertc at robertcollins.net-20060714060110-774502f9583b3d1c
    parent: robertc at robertcollins.net-20060714054631-831827119939d138
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Fri 2006-07-14 16:01:10 +1000
    message:
      Introduce a WorkingTree Format 4, which is the new dirstate format.
    ------------------------------------------------------------
    revno: 1852.4.1
    merged: robertc at robertcollins.net-20060714054631-831827119939d138
    parent: pqm at pqm.ubuntu.com-20060711204542-8e872becb9b4caf9
    parent: robertc at robertcollins.net-20060714052817-76f18c3e784ed1ef
    committer: Robert Collins <robertc at robertcollins.net>
    branch nick: WorkingTree Format 4
    timestamp: Fri 2006-07-14 15:46:31 +1000
    message:
      Merge in prepatory work for adding WorkingTreeFormat4.

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



More information about the bazaar-commits mailing list