Rev 3567: Merge .dev. in http://people.ubuntu.com/~robertc/baz2.0/btree-graphindex
Robert Collins
robertc at robertcollins.net
Mon Jul 28 07:09:01 BST 2008
At http://people.ubuntu.com/~robertc/baz2.0/btree-graphindex
------------------------------------------------------------
revno: 3567
revision-id: robertc at robertcollins.net-20080728060842-uayjy217i066dvct
parent: robertc at robertcollins.net-20080728050954-iyok0yyqonml80q7
parent: pqm at pqm.ubuntu.com-20080725151945-kdaru30ix1m8k0h6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: btree-graphindex
timestamp: Mon 2008-07-28 16:08:42 +1000
message:
Merge .dev.
added:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 3565.1.16
revision-id: pqm at pqm.ubuntu.com-20080725151945-kdaru30ix1m8k0h6
parent: pqm at pqm.ubuntu.com-20080725144520-ir7276gij462t1te
parent: andrew.bennetts at canonical.com-20080725093926-xlyj4ahs24pu1a9c
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-07-25 16:19:45 +0100
message:
Add TipChangeRejected error so that pre_change_branch_tip hook
functions can cleanly reject a change. (Andrew Bennetts)
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3565.12.3
revision-id: andrew.bennetts at canonical.com-20080725093926-xlyj4ahs24pu1a9c
parent: andrew.bennetts at canonical.com-20080725081420-aofimy5p9022c83r
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: tip-change-rejected-error
timestamp: Fri 2008-07-25 19:39:26 +1000
message:
Fix test_trace failure: BzrError._format shouldn't call str() itself, it should leave that to __str__.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
------------------------------------------------------------
revno: 3565.12.2
revision-id: andrew.bennetts at canonical.com-20080725081420-aofimy5p9022c83r
parent: andrew.bennetts at canonical.com-20080725064208-ui70gluukdypd4y9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: tip-change-rejected-error
timestamp: Fri 2008-07-25 18:14:20 +1000
message:
If there are no post_change_branch_tip hooks to run in set_revision_history, don't calculate last_revision_info().
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
------------------------------------------------------------
revno: 3565.12.1
revision-id: andrew.bennetts at canonical.com-20080725064208-ui70gluukdypd4y9
parent: pqm at pqm.ubuntu.com-20080724061047-yrvo5cmeik38kibz
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: tip-change-rejected-error
timestamp: Fri 2008-07-25 16:42:08 +1000
message:
Cherry-pick TipChangeRejected changes from pre-branch-tip-changed-hook loom.
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3565.1.15
revision-id: pqm at pqm.ubuntu.com-20080725144520-ir7276gij462t1te
parent: pqm at pqm.ubuntu.com-20080725062645-tsvznpy0m5b0xqhy
parent: aaron at aaronbentley.com-20080722203743-365cpimh27w7nzrx
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-07-25 15:45:20 +0100
message:
Implement plan_merge and set_parent_ids on PreviewTree
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 3363.9.8
revision-id: aaron at aaronbentley.com-20080722203743-365cpimh27w7nzrx
parent: aaron at aaronbentley.com-20080722203358-ttyo4ltdqt9ea1kq
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: plan_merge
timestamp: Tue 2008-07-22 16:37:43 -0400
message:
Ensure plan_file_merge works with a RevisionTree as the basis
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
------------------------------------------------------------
revno: 3363.9.7
revision-id: aaron at aaronbentley.com-20080722203358-ttyo4ltdqt9ea1kq
parent: aaron at aaronbentley.com-20080722202143-1mv4hl1p3n5g8zk6
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: plan_merge
timestamp: Tue 2008-07-22 16:33:58 -0400
message:
Fix up to use set_parent_ids
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
------------------------------------------------------------
revno: 3363.9.6
revision-id: aaron at aaronbentley.com-20080722202143-1mv4hl1p3n5g8zk6
parent: aaron at aaronbentley.com-20080722180649-desza99rl5386sjj
parent: aaron at aaronbentley.com-20080722201845-2uksn8b7k60wkd3o
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: plan_merge
timestamp: Tue 2008-07-22 16:21:43 -0400
message:
Merge with set_parent_ids
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3565.11.1
revision-id: aaron at aaronbentley.com-20080722201845-2uksn8b7k60wkd3o
parent: pqm at pqm.ubuntu.com-20080722103935-leq46n7723oi910e
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: set_parent_ids
timestamp: Tue 2008-07-22 16:18:45 -0400
message:
Allow set/get of parent_ids in PreviewTree
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.9.5
revision-id: aaron at aaronbentley.com-20080722180649-desza99rl5386sjj
parent: aaron at aaronbentley.com-20080722175734-oxfdwvh79qzw5upi
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: plan_merge
timestamp: Tue 2008-07-22 14:06:49 -0400
message:
Move killed-a from top to bottom
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
------------------------------------------------------------
revno: 3363.9.4
revision-id: aaron at aaronbentley.com-20080722175734-oxfdwvh79qzw5upi
parent: aaron at aaronbentley.com-20080703132850-y4zqn99hearrh81e
parent: pqm at pqm.ubuntu.com-20080722103935-leq46n7723oi910e
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: plan_merge
timestamp: Tue 2008-07-22 13:57:34 -0400
message:
Merge with bzr.dev
added:
bzrlib/_walkdirs_win32.h _walkdirs_win32.h-20080716220454-kweh3tgxez5dvw2l-1
bzrlib/_walkdirs_win32.pyx _walkdirs_win32.pyx-20080716220454-kweh3tgxez5dvw2l-2
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/repository_implementations/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/test__walkdirs_win32.py test__walkdirs_win32-20080716220454-kweh3tgxez5dvw2l-3
contrib/bash/bzrbashprompt.sh bzrbashprompt.sh-20080414112733-b78chl4ubylc6775-1
doc/en/user-guide/stacked.txt stacked.txt-20080711023247-4uh9oovoka0sze8b-1
tools/win32/run_script.py run_script.py-20080717003927-k6itvarbtnwk44o9-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
bzrlib/ignores.py ignores.py-20060712153832-2von9l0t7p43ixsv-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_check.py test_check.py-20071024054728-mn44rt3z5hnqcbke-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_ignores.py test_ignores.py-20060712172354-vqq9ln0t8di27v53-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
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_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/trace.py trace.py-20070828055009-7kt0bbc4t4b92apz-1
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/en/user-guide/browsing_history.txt browsing_history.txt-20071121073725-0corxykv5irjal00-2
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/organizing_branches.txt organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/rst2html.py rst2html.py-20060817120932-gn177u8v0008txhu-1
------------------------------------------------------------
revno: 3363.9.3
revision-id: aaron at aaronbentley.com-20080703132850-y4zqn99hearrh81e
parent: aaron at aaronbentley.com-20080702191820-yhi9zv3swh75st1r
parent: pqm at pqm.ubuntu.com-20080703113657-6twl1rf07wq3o42d
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: plan_merge
timestamp: Thu 2008-07-03 09:28:50 -0400
message:
Merge with bzr.dev
added:
bzrlib/help_topics/en/patterns.txt patterns.txt-20080625070357-wx8qm46a19ejwfns-1
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/globbing.py glob.py-20061113075651-q63o2v35fm2ydk9x-1
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_locale.py test_lang.py-20060824204205-80v50j25qkuop7yn-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_globbing.py test_glob.py-20061113075651-q63o2v35fm2ydk9x-2
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/timestamp.py timestamp.py-20070306142322-ttbb9oulf3jotljd-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
------------------------------------------------------------
revno: 3363.9.2
revision-id: aaron at aaronbentley.com-20080702191820-yhi9zv3swh75st1r
parent: aaron at aaronbentley.com-20080702150603-ho0gnodv6xagl5t1
parent: aaron at aaronbentley.com-20080702191803-8ton89iwa6p7h5ay
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: plan_merge
timestamp: Wed 2008-07-02 15:18:20 -0400
message:
Merge with is_executable
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 3363.9.1
revision-id: aaron at aaronbentley.com-20080702150603-ho0gnodv6xagl5t1
parent: aaron at aaronbentley.com-20080702132722-xoxdhvdlo2eg0q4a
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: plan_merge
timestamp: Wed 2008-07-02 11:06:03 -0400
message:
Implement plan_merge, refactoring various bits
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
------------------------------------------------------------
revno: 3565.1.14
revision-id: pqm at pqm.ubuntu.com-20080725062645-tsvznpy0m5b0xqhy
parent: pqm at pqm.ubuntu.com-20080725055706-inu9eei2f8epz7az
parent: mbp at sourcefrog.net-20080725053342-x9s9xqirv2ar9f59
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-07-25 07:26:45 +0100
message:
(mbp) branch --stacked should make a stacked format
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
------------------------------------------------------------
revno: 3565.9.3
revision-id: mbp at sourcefrog.net-20080725053342-x9s9xqirv2ar9f59
parent: mbp at sourcefrog.net-20080725053245-pzj4ojq610mls3rv
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: stacking
timestamp: Fri 2008-07-25 15:33:42 +1000
message:
NEWS update
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3565.9.2
revision-id: mbp at sourcefrog.net-20080725053245-pzj4ojq610mls3rv
parent: mbp at sourcefrog.net-20080724051940-h9reurya2k9v2gqt
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: stacking
timestamp: Fri 2008-07-25 15:32:45 +1000
message:
branch --stacked should force a stacked format
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
------------------------------------------------------------
revno: 3565.1.13
revision-id: pqm at pqm.ubuntu.com-20080725055706-inu9eei2f8epz7az
parent: pqm at pqm.ubuntu.com-20080724061047-yrvo5cmeik38kibz
parent: andrew.bennetts at canonical.com-20080725024530-br5u6kelsti33di6
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-07-25 06:57:06 +0100
message:
Deprecate knit repositories. (Andrew Bennetts)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 3565.10.2
revision-id: andrew.bennetts at canonical.com-20080725024530-br5u6kelsti33di6
parent: andrew.bennetts at canonical.com-20080724082805-lmvzdmrwhzqou2ut
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: warn-about-knits
timestamp: Fri 2008-07-25 12:45:30 +1000
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3565.10.1
revision-id: andrew.bennetts at canonical.com-20080724082805-lmvzdmrwhzqou2ut
parent: pqm at pqm.ubuntu.com-20080723232923-z04bd6zco9cpa3zv
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: warn-about-knits
timestamp: Thu 2008-07-24 18:28:05 +1000
message:
Deprecate knit repositories.
modified:
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 3565.1.12
revision-id: pqm at pqm.ubuntu.com-20080724061047-yrvo5cmeik38kibz
parent: pqm at pqm.ubuntu.com-20080724054109-qqw7c0ecmk5a0ega
parent: mbp at sourcefrog.net-20080724051940-h9reurya2k9v2gqt
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-07-24 07:10:47 +0100
message:
(mbp) rename stacked format to 1.6
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
------------------------------------------------------------
revno: 3565.9.1
revision-id: mbp at sourcefrog.net-20080724051940-h9reurya2k9v2gqt
parent: pqm at pqm.ubuntu.com-20080723232923-z04bd6zco9cpa3zv
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: stacking
timestamp: Thu 2008-07-24 15:19:40 +1000
message:
Rename stacked format to 1.6
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
------------------------------------------------------------
revno: 3565.1.11
revision-id: pqm at pqm.ubuntu.com-20080724054109-qqw7c0ecmk5a0ega
parent: pqm at pqm.ubuntu.com-20080723232923-z04bd6zco9cpa3zv
parent: andrew.bennetts at canonical.com-20080724050520-k4h3twti3nt9o82a
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-07-24 06:41:09 +0100
message:
(trivial) Tidy imports in blackbox.test_info,
fixing test failure when running test_info alone caused by a missing
import. (Andrew Bennetts)
modified:
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
------------------------------------------------------------
revno: 3565.8.1
revision-id: andrew.bennetts at canonical.com-20080724050520-k4h3twti3nt9o82a
parent: pqm at pqm.ubuntu.com-20080723232923-z04bd6zco9cpa3zv
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: trivial-test-fix
timestamp: Thu 2008-07-24 15:05:20 +1000
message:
Tidy imports in blackbox.test_info, fixing trivial test failure caused by a missing import.
modified:
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
------------------------------------------------------------
revno: 3565.1.10
revision-id: pqm at pqm.ubuntu.com-20080723232923-z04bd6zco9cpa3zv
parent: pqm at pqm.ubuntu.com-20080723220742-a8lvchadnsga1wxy
parent: andrew.bennetts at canonical.com-20080723225338-d7fkouy3h3q195cu
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-07-24 00:29:23 +0100
message:
Remote duplication of error translation in bzrlib/remote.py. (Andrew
Bennetts)
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3533.3.5
revision-id: andrew.bennetts at canonical.com-20080723225338-d7fkouy3h3q195cu
parent: andrew.bennetts at canonical.com-20080723111810-4xhz3ia298444oyg
parent: pqm at pqm.ubuntu.com-20080723220742-a8lvchadnsga1wxy
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote-translate-error
timestamp: Thu 2008-07-24 08:53:38 +1000
message:
Merge from bzr.dev.
added:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_rules.py test_properties.py-20080506033501-3p9kmuob25dho8xl-1
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 3533.3.4
revision-id: andrew.bennetts at canonical.com-20080723111810-4xhz3ia298444oyg
parent: andrew.bennetts at canonical.com-20080723081003-fa7hm8rl07mnp91r
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote-translate-error
timestamp: Wed 2008-07-23 21:18:10 +1000
message:
Add tests for _translate_error's robustness.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3533.3.3
revision-id: andrew.bennetts at canonical.com-20080723081003-fa7hm8rl07mnp91r
parent: andrew.bennetts at canonical.com-20080718052215-litbf3xf9me5q3cp
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote-translate-error
timestamp: Wed 2008-07-23 18:10:03 +1000
message:
Add unit tests for bzrlib.remote._translate_error.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3533.3.2
revision-id: andrew.bennetts at canonical.com-20080718052215-litbf3xf9me5q3cp
parent: andrew.bennetts at canonical.com-20080709042605-rdx9mqaufe2gukb4
parent: pqm at pqm.ubuntu.com-20080717225948-n84fbip5sl9n1mde
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote-translate-error
timestamp: Fri 2008-07-18 15:22:15 +1000
message:
Merge bzr.dev.
added:
bzrlib/_walkdirs_win32.h _walkdirs_win32.h-20080716220454-kweh3tgxez5dvw2l-1
bzrlib/_walkdirs_win32.pyx _walkdirs_win32.pyx-20080716220454-kweh3tgxez5dvw2l-2
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/repository_implementations/test_add_fallback_repository.py test_add_fallback_re-20080215040003-8w9n4ck9uqdxj18m-1
bzrlib/tests/test__walkdirs_win32.py test__walkdirs_win32-20080716220454-kweh3tgxez5dvw2l-3
doc/en/user-guide/stacked.txt stacked.txt-20080711023247-4uh9oovoka0sze8b-1
tools/win32/run_script.py run_script.py-20080717003927-k6itvarbtnwk44o9-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/commands/test_push.py test_push.py-20070525122003-gc1ob0ea0nueoqgj-1
bzrlib/tests/per_repository_reference/test_add_inventory.py test_add_inventory.p-20080220025549-nnm2s80it1lvcwnc-3
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_http_response.py test_http_response.py-20060628233143-950b2a482a32505d
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/transport/http/response.py _response.py-20060613154423-a2ci7hd4iw5c7fnt-1
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/en/user-guide/browsing_history.txt browsing_history.txt-20071121073725-0corxykv5irjal00-2
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/en/user-guide/organizing_branches.txt organizing_branches.-20071123154453-dk2mjhrg1vpjm5w2-3
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/rst2html.py rst2html.py-20060817120932-gn177u8v0008txhu-1
------------------------------------------------------------
revno: 3533.3.1
revision-id: andrew.bennetts at canonical.com-20080709042605-rdx9mqaufe2gukb4
parent: pqm at pqm.ubuntu.com-20080708172503-gl2dtaz3v7fyc2sl
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: remote-error-translation
timestamp: Wed 2008-07-09 14:26:05 +1000
message:
Remove duplication of error translation in bzrlib/remote.py.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3565.1.9
revision-id: pqm at pqm.ubuntu.com-20080723220742-a8lvchadnsga1wxy
parent: pqm at pqm.ubuntu.com-20080723094000-gxsppck6d857txr1
parent: michael.hudson at canonical.com-20080723211109-o0u76jlxr7yqr79j
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-07-23 23:07:42 +0100
message:
(robertc) Support relative paths in stacking policies (Michael Hudson)
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
------------------------------------------------------------
revno: 3565.7.7
revision-id: michael.hudson at canonical.com-20080723211109-o0u76jlxr7yqr79j
parent: michael.hudson at canonical.com-20080723205513-o4otck9lsnenivha
committer: Michael Hudson <michael.hudson at canonical.com>
branch nick: bzrdir.clone-pass-on-stacking-base-bug-250418
timestamp: Thu 2008-07-24 09:11:09 +1200
message:
better docstring
modified:
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
------------------------------------------------------------
revno: 3565.7.6
revision-id: michael.hudson at canonical.com-20080723205513-o4otck9lsnenivha
parent: michael.hudson at canonical.com-20080723203553-bsidcosj9ln1l2a8
committer: Michael Hudson <michael.hudson at canonical.com>
branch nick: bzrdir.clone-pass-on-stacking-base-bug-250418
timestamp: Thu 2008-07-24 08:55:13 +1200
message:
oops
modified:
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
------------------------------------------------------------
revno: 3565.7.5
revision-id: michael.hudson at canonical.com-20080723203553-bsidcosj9ln1l2a8
parent: michael.hudson at canonical.com-20080722035558-l8kyq1fmcjeamrgq
committer: Michael Hudson <michael.hudson at canonical.com>
branch nick: bzrdir.clone-pass-on-stacking-base-bug-250418
timestamp: Thu 2008-07-24 08:35:53 +1200
message:
use TestNotApplicable in all the stacking clone() tests.
modified:
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
------------------------------------------------------------
revno: 3565.7.4
revision-id: michael.hudson at canonical.com-20080722035558-l8kyq1fmcjeamrgq
parent: michael.hudson at canonical.com-20080722034339-5g1ncta1ht2grt8i
committer: Michael Hudson <michael.hudson at canonical.com>
branch nick: bzrdir.clone-pass-on-stacking-base-bug-250418
timestamp: Tue 2008-07-22 15:55:58 +1200
message:
make test a lot better
modified:
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
------------------------------------------------------------
revno: 3565.7.3
revision-id: michael.hudson at canonical.com-20080722034339-5g1ncta1ht2grt8i
parent: michael.hudson at canonical.com-20080722030243-gaec8odgm519lwq0
committer: Michael Hudson <michael.hudson at canonical.com>
branch nick: bzrdir.clone-pass-on-stacking-base-bug-250418
timestamp: Tue 2008-07-22 15:43:39 +1200
message:
very hackish test
modified:
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
------------------------------------------------------------
revno: 3565.7.2
revision-id: michael.hudson at canonical.com-20080722030243-gaec8odgm519lwq0
parent: michael.hudson at canonical.com-20080721230902-uxnl2s9bjila8xk4
parent: michael.hudson at canonical.com-20080722025510-uioyrzmam21fgu4y
committer: Michael Hudson <michael.hudson at canonical.com>
branch nick: bzrdir.clone-pass-on-stacking-base-bug-250418
timestamp: Tue 2008-07-22 15:02:43 +1200
message:
merge rebase-..-paths
modified:
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
------------------------------------------------------------
revno: 3565.7.1
revision-id: michael.hudson at canonical.com-20080721230902-uxnl2s9bjila8xk4
parent: pqm at pqm.ubuntu.com-20080721151553-11iasd1407hkznk1
author: Jonathan Lange" <jml at canonical.com>
committer: Michael Hudson <michael.hudson at canonical.com>
branch nick: bzrdir.clone-pass-on-stacking-base-bug-250418
timestamp: Tue 2008-07-22 11:09:02 +1200
message:
jml's one line fix
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3565.1.8
revision-id: pqm at pqm.ubuntu.com-20080723094000-gxsppck6d857txr1
parent: pqm at pqm.ubuntu.com-20080722202646-5kwh910svyyumzre
parent: mbp at sourcefrog.net-20080723043509-o7mrsuls2j08kizx
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-07-23 10:40:00 +0100
message:
(mbp) more ppa process documentation
added:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
modified:
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 3549.3.1
revision-id: mbp at sourcefrog.net-20080723043509-o7mrsuls2j08kizx
parent: pqm at pqm.ubuntu.com-20080717023455-idnyms69oiauf7fh
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Wed 2008-07-23 14:35:09 +1000
message:
Updated instructions in packaging into the PPA
added:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
modified:
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
------------------------------------------------------------
revno: 3565.1.7
revision-id: pqm at pqm.ubuntu.com-20080722202646-5kwh910svyyumzre
parent: pqm at pqm.ubuntu.com-20080722103935-leq46n7723oi910e
parent: michael.hudson at canonical.com-20080722025510-uioyrzmam21fgu4y
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-07-22 21:26:46 +0100
message:
(Michael Hudson) urutils.rebase_url handles '..' path segments in the
url
modified:
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
------------------------------------------------------------
revno: 3565.6.1
revision-id: michael.hudson at canonical.com-20080722025510-uioyrzmam21fgu4y
parent: pqm at pqm.ubuntu.com-20080721151553-11iasd1407hkznk1
committer: Michael Hudson <michael.hudson at canonical.com>
branch nick: rebase-..-paths
timestamp: Tue 2008-07-22 14:55:10 +1200
message:
urlutils.rebase_url handles '..' path segments in 'url'
modified:
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
------------------------------------------------------------
revno: 3565.1.6
revision-id: pqm at pqm.ubuntu.com-20080722103935-leq46n7723oi910e
parent: pqm at pqm.ubuntu.com-20080722095403-sdixt0nfim5q3eps
parent: ian.clatworthy at canonical.com-20080722095215-jqwihdatu1q7k08r
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-07-22 11:39:35 +0100
message:
allow push over hpss to set default stacking policy (Michael Hudson)
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
------------------------------------------------------------
revno: 3565.5.1
revision-id: ian.clatworthy at canonical.com-20080722095215-jqwihdatu1q7k08r
parent: pqm at pqm.ubuntu.com-20080722022519-tu60do9k4tkjmtl4
parent: michael.hudson at canonical.com-20080722001233-7poo8pnk6uwlp90p
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Tue 2008-07-22 19:52:15 +1000
message:
allow push over hpss to set default stacking policy (Michael Hudson)
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
------------------------------------------------------------
revno: 3565.4.4
revision-id: michael.hudson at canonical.com-20080722001233-7poo8pnk6uwlp90p
parent: michael.hudson at canonical.com-20080722000817-yx714k2csohzbx6z
committer: Michael Hudson <michael.hudson at canonical.com>
branch nick: add-RemoteBzrDir.get_config-bug-250422
timestamp: Tue 2008-07-22 12:12:33 +1200
message:
assert other way around in test again
modified:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
------------------------------------------------------------
revno: 3565.4.3
revision-id: michael.hudson at canonical.com-20080722000817-yx714k2csohzbx6z
parent: michael.hudson at canonical.com-20080722000709-grbo6ivpkstoj96z
committer: Michael Hudson <michael.hudson at canonical.com>
branch nick: add-RemoteBzrDir.get_config-bug-250422
timestamp: Tue 2008-07-22 12:08:17 +1200
message:
fix problem
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3565.4.2
revision-id: michael.hudson at canonical.com-20080722000709-grbo6ivpkstoj96z
parent: michael.hudson at canonical.com-20080722000117-f567pa1we4uvxafh
committer: Michael Hudson <michael.hudson at canonical.com>
branch nick: add-RemoteBzrDir.get_config-bug-250422
timestamp: Tue 2008-07-22 12:07:09 +1200
message:
fix test some more
modified:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
------------------------------------------------------------
revno: 3565.4.1
revision-id: michael.hudson at canonical.com-20080722000117-f567pa1we4uvxafh
parent: pqm at pqm.ubuntu.com-20080721151553-11iasd1407hkznk1
committer: Michael Hudson <michael.hudson at canonical.com>
branch nick: add-RemoteBzrDir.get_config-bug-250422
timestamp: Tue 2008-07-22 12:01:17 +1200
message:
make test more optimistic
modified:
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
------------------------------------------------------------
revno: 3565.1.5
revision-id: pqm at pqm.ubuntu.com-20080722095403-sdixt0nfim5q3eps
parent: pqm at pqm.ubuntu.com-20080722022519-tu60do9k4tkjmtl4
parent: mbp at sourcefrog.net-20080722090552-02kmodiejqw2zism
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-07-22 10:54:03 +0100
message:
(mbp) add stable stacked and stacked-rich-root formats
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
------------------------------------------------------------
revno: 3549.1.6
revision-id: mbp at sourcefrog.net-20080722090552-02kmodiejqw2zism
parent: mbp at sourcefrog.net-20080721092225-lnm32309nas4cp91
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: stacking
timestamp: Tue 2008-07-22 19:05:52 +1000
message:
Change stacked-subtree to stacked-rich-root
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
------------------------------------------------------------
revno: 3549.1.5
revision-id: mbp at sourcefrog.net-20080721092225-lnm32309nas4cp91
parent: mbp at sourcefrog.net-20080717080025-bd9k6gpkkkntipwr
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: stacking
timestamp: Mon 2008-07-21 19:22:25 +1000
message:
Add stable format names for stacked branches
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
------------------------------------------------------------
revno: 3565.1.4
revision-id: pqm at pqm.ubuntu.com-20080722022519-tu60do9k4tkjmtl4
parent: pqm at pqm.ubuntu.com-20080722012453-i58b5mk2wayinusg
parent: john at arbash-meinel.com-20080722015109-6vmj3p9mebbyd4d9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-07-22 03:25:19 +0100
message:
(jam) fix raising an AssertionError to not supply bogus arguments
(trivial)
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3535.5.2
revision-id: john at arbash-meinel.com-20080722015109-6vmj3p9mebbyd4d9
parent: john at arbash-meinel.com-20080709195736-s9cg26gnym3lf2d0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2008-07-21 20:51:09 -0500
message:
AssertionError doesn't take extra arguments.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3565.1.3
revision-id: pqm at pqm.ubuntu.com-20080722012453-i58b5mk2wayinusg
parent: pqm at pqm.ubuntu.com-20080721151553-11iasd1407hkznk1
parent: andrew.bennetts at canonical.com-20080722005803-ldnjji030xujgz6g
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-07-22 02:24:53 +0100
message:
Make sure we never read more than 64k at a time from a smart medium.
(Andrew Bennetts, #246180)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
------------------------------------------------------------
revno: 3565.3.4
revision-id: andrew.bennetts at canonical.com-20080722005803-ldnjji030xujgz6g
parent: andrew.bennetts at canonical.com-20080722005219-0r7fsjq3saiway80
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-v3-memory-error
timestamp: Tue 2008-07-22 10:58:03 +1000
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3565.3.3
revision-id: andrew.bennetts at canonical.com-20080722005219-0r7fsjq3saiway80
parent: andrew.bennetts at canonical.com-20080721084517-cr5489aq0kb9zw5z
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-v3-memory-error
timestamp: Tue 2008-07-22 10:52:19 +1000
message:
Define a _MAX_READ_SIZE constant as suggested by John's review.
modified:
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
------------------------------------------------------------
revno: 3565.3.2
revision-id: andrew.bennetts at canonical.com-20080721084517-cr5489aq0kb9zw5z
parent: andrew.bennetts at canonical.com-20080721042421-63lh85e76o57jch4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-v3-memory-error
timestamp: Mon 2008-07-21 18:45:17 +1000
message:
Delete some more code, fix some bugs, add more comments.
modified:
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
------------------------------------------------------------
revno: 3565.3.1
revision-id: andrew.bennetts at canonical.com-20080721042421-63lh85e76o57jch4
parent: pqm at pqm.ubuntu.com-20080718100017-segv2csk7ux2xs9p
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-v3-memory-error
timestamp: Mon 2008-07-21 14:24:21 +1000
message:
Read no more then 64k at a time in the smart protocol code.
The logic for this has been moved entirely into bzrlib.smart.medium, and
duplication (both in that module, and in bzrlib.smart.protocol) has been mostly
refactored out. In particular there's now a SmartMedium base class used for
both client- and server-side media, and only one place that reading a line is
implemented.
modified:
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
------------------------------------------------------------
revno: 3565.1.2
revision-id: pqm at pqm.ubuntu.com-20080721151553-11iasd1407hkznk1
parent: pqm at pqm.ubuntu.com-20080721092720-z0bvnt4ljysbqjis
parent: aaron at aaronbentley.com-20080721144641-g2j1i3bvqu92c49a
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-07-21 16:15:53 +0100
message:
Fix file -> directory handling (jwestby, #248448)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3565.2.2
revision-id: aaron at aaronbentley.com-20080721144641-g2j1i3bvqu92c49a
parent: aaron at aaronbentley.com-20080721144605-i51s20nw892vtoim
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzr.ab.integration
timestamp: Mon 2008-07-21 10:46:41 -0400
message:
Fix copyright dates
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
------------------------------------------------------------
revno: 3565.2.1
revision-id: aaron at aaronbentley.com-20080721144605-i51s20nw892vtoim
parent: pqm at pqm.ubuntu.com-20080721092720-z0bvnt4ljysbqjis
parent: jw+debian at jameswestby.net-20080718162747-2ttgkhazeymmoxm0
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzr.ab.integration
timestamp: Mon 2008-07-21 10:46:05 -0400
message:
Merge fix from jwestby
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3535.6.3
revision-id: jw+debian at jameswestby.net-20080718162747-2ttgkhazeymmoxm0
parent: jw+debian at jameswestby.net-20080717155609-bvwrtxv3uhnlqvs6
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.stat
timestamp: Fri 2008-07-18 17:27:47 +0100
message:
Fix the test to not create transform conflicts.
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
------------------------------------------------------------
revno: 3535.6.2
revision-id: jw+debian at jameswestby.net-20080717155609-bvwrtxv3uhnlqvs6
parent: jw+debian at jameswestby.net-20080716163855-dfc57i41ua7y5std
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.stat
timestamp: Thu 2008-07-17 16:56:09 +0100
message:
Fixes from review. Thanks Aaron and John.
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3535.6.1
revision-id: jw+debian at jameswestby.net-20080716163855-dfc57i41ua7y5std
parent: pqm at pqm.ubuntu.com-20080709135859-wq3r1d1fjcafelgw
committer: James Westby <jw+debian at jameswestby.net>
branch nick: bzr.dev.stat
timestamp: Wed 2008-07-16 17:38:55 +0100
message:
Handle a file turning in to a directory in TreeTransform.
If a file turns in to a directory, then when TreeTransform stats
any children of the new directory when they are added it gets
ENOTDIR. This tells us the file doesn't exist, and so we handle
it in the same way as ENOENT.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3565.1.1
revision-id: pqm at pqm.ubuntu.com-20080721092720-z0bvnt4ljysbqjis
parent: pqm at pqm.ubuntu.com-20080718100017-segv2csk7ux2xs9p
parent: mbp at sourcefrog.net-20080721085833-9s05ca14867t4ww3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-07-21 10:27:20 +0100
message:
(mbp) Use test names in the temporary directory name
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
------------------------------------------------------------
revno: 3549.2.4
revision-id: mbp at sourcefrog.net-20080721085833-9s05ca14867t4ww3
parent: mbp at sourcefrog.net-20080721080723-bj3tobeir4xf7f3s
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: lock-warnings
timestamp: Mon 2008-07-21 18:58:33 +1000
message:
Rename _getTestDirPrefix not to look like a test
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3549.2.3
revision-id: mbp at sourcefrog.net-20080721080723-bj3tobeir4xf7f3s
parent: mbp at sourcefrog.net-20080721074830-i1pgj2hswpfo6pav
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: lock-warnings
timestamp: Mon 2008-07-21 18:07:23 +1000
message:
Remove import of now-deprecated MultipleRevisionSources
modified:
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
------------------------------------------------------------
revno: 3549.2.2
revision-id: mbp at sourcefrog.net-20080721074830-i1pgj2hswpfo6pav
parent: mbp at sourcefrog.net-20080717065451-aa6bw10px29222mh
parent: pqm at pqm.ubuntu.com-20080718030707-qimx9fv1d4xhlk1m
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: lock-warnings
timestamp: Mon 2008-07-21 17:48:30 +1000
message:
merge trunk
added:
bzrlib/_walkdirs_win32.h _walkdirs_win32.h-20080716220454-kweh3tgxez5dvw2l-1
bzrlib/_walkdirs_win32.pyx _walkdirs_win32.pyx-20080716220454-kweh3tgxez5dvw2l-2
bzrlib/tests/test__walkdirs_win32.py test__walkdirs_win32-20080716220454-kweh3tgxez5dvw2l-3
doc/en/user-guide/stacked.txt stacked.txt-20080711023247-4uh9oovoka0sze8b-1
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/push.py push.py-20080606021927-5fe39050e8xne9un-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
doc/en/user-guide/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3549.2.1
revision-id: mbp at sourcefrog.net-20080717065451-aa6bw10px29222mh
parent: pqm at pqm.ubuntu.com-20080717023455-idnyms69oiauf7fh
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: lock-warnings
timestamp: Thu 2008-07-17 16:54:51 +1000
message:
Use test names in the temporary directory name
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
Diff too large for email (2673 lines, the limit is 1000).
More information about the bazaar-commits
mailing list