Rev 3624: Resolve NEWS conflicts. in http://people.ubuntu.com/~robertc/baz2.0/integration
Robert Collins
robertc at robertcollins.net
Fri Aug 15 05:13:06 BST 2008
At http://people.ubuntu.com/~robertc/baz2.0/integration
------------------------------------------------------------
revno: 3624
revision-id: robertc at robertcollins.net-20080815041247-xycggdgkzkkeide4
parent: robertc at robertcollins.net-20080815024542-leg2xenbvo883tcc
parent: pqm at pqm.ubuntu.com-20080815025810-eguaiqf0kwwqo4yp
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Fri 2008-08-15 14:12:47 +1000
message:
Resolve NEWS conflicts.
added:
doc/en/developer-guide/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
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/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3619.1.17
revision-id: pqm at pqm.ubuntu.com-20080815025810-eguaiqf0kwwqo4yp
parent: pqm at pqm.ubuntu.com-20080814211426-i0rmbyhjxf4hi7pt
parent: john at arbash-meinel.com-20080814201521-vz11z6uh7b0pcnxg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-08-15 03:58:10 +0100
message:
(jam) RemoteBranch.revision_id_to_revno defers to the real branch
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3619.11.1
revision-id: john at arbash-meinel.com-20080814201521-vz11z6uh7b0pcnxg
parent: pqm at pqm.ubuntu.com-20080814195737-7tpxreg897vxlmr5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: remote_rev_id_to_revno
timestamp: Thu 2008-08-14 15:15:21 -0500
message:
Thunk over to the real branch's revision_id_to_revno.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3619.1.16
revision-id: pqm at pqm.ubuntu.com-20080814211426-i0rmbyhjxf4hi7pt
parent: pqm at pqm.ubuntu.com-20080814195737-7tpxreg897vxlmr5
parent: john at arbash-meinel.com-20080814204222-a1ya5pp0pr7lmev8
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-14 22:14:26 +0100
message:
(jam)(trivial) NEWS fix
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3619.10.1
revision-id: john at arbash-meinel.com-20080814204222-a1ya5pp0pr7lmev8
parent: pqm at pqm.ubuntu.com-20080814195737-7tpxreg897vxlmr5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2008-08-14 15:42:22 -0500
message:
Fix an incorrectly placed NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3619.1.15
revision-id: pqm at pqm.ubuntu.com-20080814195737-7tpxreg897vxlmr5
parent: pqm at pqm.ubuntu.com-20080814185546-98x0mdzxsmj5b5wr
parent: john at arbash-meinel.com-20080814192259-lwm1mqhwgzi3u600
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-14 20:57:37 +0100
message:
(jam) Merge bzr-1.6rc3 into bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3619.9.1
revision-id: john at arbash-meinel.com-20080814192259-lwm1mqhwgzi3u600
parent: pqm at pqm.ubuntu.com-20080814185546-98x0mdzxsmj5b5wr
parent: pqm at pqm.ubuntu.com-20080814165207-0sfq9u9vy6rl7oxc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2008-08-14 14:22:59 -0500
message:
Merge bzr-1.6rc3 into bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3606.5.5
revision-id: pqm at pqm.ubuntu.com-20080814165207-0sfq9u9vy6rl7oxc
parent: pqm at pqm.ubuntu.com-20080814161828-cnj0l5hcd118zmt5
parent: john at arbash-meinel.com-20080814151046-75yoco8fdw9mk2ny
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Thu 2008-08-14 17:52:07 +0100
message:
Release bzr-1.6rc3
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3606.6.3
revision-id: john at arbash-meinel.com-20080814151046-75yoco8fdw9mk2ny
parent: john at arbash-meinel.com-20080814150333-gth1p57ghvbpu54o
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2008-08-14 10:10:46 -0500
message:
Update version strings for bzr-1.6rc3
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3606.6.2
revision-id: john at arbash-meinel.com-20080814150333-gth1p57ghvbpu54o
parent: john at arbash-meinel.com-20080814145830-hsj8dytdcqze3mvg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2008-08-14 10:03:33 -0500
message:
Add NEWS entries for the other changes that were added for bzr-1.6rc3
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3606.5.4
revision-id: pqm at pqm.ubuntu.com-20080814161828-cnj0l5hcd118zmt5
parent: pqm at pqm.ubuntu.com-20080814055033-myv5ibn1lb50yf0t
parent: john at arbash-meinel.com-20080814145830-hsj8dytdcqze3mvg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Thu 2008-08-14 17:18:28 +0100
message:
(robertc) Trigger index._buffer_all when a significant (>1/20) of the
index is being queried.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
------------------------------------------------------------
revno: 3606.6.1
revision-id: john at arbash-meinel.com-20080814145830-hsj8dytdcqze3mvg
parent: pqm at pqm.ubuntu.com-20080814055033-myv5ibn1lb50yf0t
author: Robert Collins <robertc at robertcollins.net>
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2008-08-14 09:58:30 -0500
message:
Cherry-pick Robert's index buffering.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
------------------------------------------------------------
revno: 3606.5.3
revision-id: pqm at pqm.ubuntu.com-20080814055033-myv5ibn1lb50yf0t
parent: pqm at pqm.ubuntu.com-20080814051958-e951os44voh2p373
parent: mhammond at skippinet.com.au-20080814014130-ohoxsrqy94jldajv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Thu 2008-08-14 06:50:33 +0100
message:
(Mark Hammond) Updates to setup.py to support bundling tortoisebzr
and qbzr into the standalone win32 installer.
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3606.5.2
revision-id: pqm at pqm.ubuntu.com-20080814051958-e951os44voh2p373
parent: pqm at pqm.ubuntu.com-20080814045127-s91yxfoqylz4i6jr
parent: john at arbash-meinel.com-20080814030842-fuc2xackfdyatf42
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Thu 2008-08-14 06:19:58 +0100
message:
(robertc) Disable reading .bzrrules from the working tree.
modified:
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
------------------------------------------------------------
revno: 3606.5.1
revision-id: pqm at pqm.ubuntu.com-20080814045127-s91yxfoqylz4i6jr
parent: pqm at pqm.ubuntu.com-20080813185456-kn2cq6pkj6h52z9k
parent: andrew.bennetts at canonical.com-20080814021531-3axt0ak75mpxobrk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Thu 2008-08-14 05:51:27 +0100
message:
(spiv) Fix a regression in bzr+http:// where http wasn't implementing
a necessary function.
modified:
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
------------------------------------------------------------
revno: 3619.1.14
revision-id: pqm at pqm.ubuntu.com-20080814185546-98x0mdzxsmj5b5wr
parent: pqm at pqm.ubuntu.com-20080814182509-9f2dz3kcb1lv5lku
parent: john at arbash-meinel.com-20080814170856-p2ie5z7l6vowrftz
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-14 19:55:46 +0100
message:
(Marius Kruger) 'bzr init' and 'bzr init-repo' print 'bzr info' on
success
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
------------------------------------------------------------
revno: 3535.9.9
revision-id: john at arbash-meinel.com-20080814170856-p2ie5z7l6vowrftz
parent: amanic at gmail.com-20080718094435-jfxdvrxgx09zgnuc
parent: pqm at pqm.ubuntu.com-20080814074117-x0zvzzv7y6mok8pz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: init_verbose
timestamp: Thu 2008-08-14 12:08:56 -0500
message:
merge bzr.dev 3629, update NEWS entry to be in correct location.
added:
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_upgrade_stacked.py test_upgrade_stacked-20080804072225-jd13yami19nskns5-1
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
doc/en/developer-guide/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/_patiencediff_py.py cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/branchbuilder.py branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/export/__init__.py __init__.py-20051114235828-1ba62cb4062304e6
bzrlib/export/dir_exporter.py dir_exporter.py-20051114235828-b51397f56bc7b117
bzrlib/export/tar_exporter.py tar_exporter.py-20051114235828-1f6349a2f090a5d0
bzrlib/export/zip_exporter.py zip_exporter.py-20051114235828-8f57f954fba6497e
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/rules.py properties.py-20080506032617-9k06uqalkf09ck0z-1
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_check.py test_check.py-20071024054728-mn44rt3z5hnqcbke-1
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
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/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
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_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
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_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3535.9.8
revision-id: amanic at gmail.com-20080718094435-jfxdvrxgx09zgnuc
parent: amanic at gmail.com-20080718073034-gprz0287fytfoyx6
parent: pqm at pqm.ubuntu.com-20080718030707-qimx9fv1d4xhlk1m
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.init-verbose
timestamp: Fri 2008-07-18 11:44:35 +0200
message:
merg bzr.dev, moving news to the IN DEVELOPMENT section again
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/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-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/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_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/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
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: 3535.9.7
revision-id: amanic at gmail.com-20080718073034-gprz0287fytfoyx6
parent: amanic at gmail.com-20080718072906-yu692u98u9aj17z8
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.init-verbose
timestamp: Fri 2008-07-18 09:30:34 +0200
message:
add news entry
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3535.9.6
revision-id: amanic at gmail.com-20080718072906-yu692u98u9aj17z8
parent: amanic at gmail.com-20080718071023-xszw4d1jqzv6rlhy
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.init-verbose
timestamp: Fri 2008-07-18 09:29:06 +0200
message:
add explicit blackbox tests for 'init -q' and 'init-repo -q'
modified:
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
------------------------------------------------------------
revno: 3535.9.5
revision-id: amanic at gmail.com-20080718071023-xszw4d1jqzv6rlhy
parent: amanic at gmail.com-20080718070912-u44kb9nja7weozl7
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.init-verbose
timestamp: Fri 2008-07-18 09:10:23 +0200
message:
remove a trailing space I added
modified:
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
------------------------------------------------------------
revno: 3535.9.4
revision-id: amanic at gmail.com-20080718070912-u44kb9nja7weozl7
parent: amanic at gmail.com-20080716202450-qxzsk7mpfkl5gset
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.init-verbose
timestamp: Fri 2008-07-18 09:09:12 +0200
message:
use open_containing_from_transport in stead of open_containing
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3535.9.3
revision-id: amanic at gmail.com-20080716202450-qxzsk7mpfkl5gset
parent: amanic at gmail.com-20080713161536-gkuyj05s28qpaj8c
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.init-verbose
timestamp: Wed 2008-07-16 22:24:50 +0200
message:
init/init-repo shouldn't open 2 connections
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
------------------------------------------------------------
revno: 3535.9.2
revision-id: amanic at gmail.com-20080713161536-gkuyj05s28qpaj8c
parent: amanic at gmail.com-20080713084342-xtnrwlxrrsdpsufy
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.init-verbose
timestamp: Sun 2008-07-13 18:15:36 +0200
message:
make init and init-repo tests pass again
modified:
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/commands/test_init.py test_init.py-20070514074921-audbcdd8o56dpame-1
bzrlib/tests/commands/test_init_repository.py test_init_repository-20070525163812-87xw0678ky573l27-1
------------------------------------------------------------
revno: 3535.9.1
revision-id: amanic at gmail.com-20080713084342-xtnrwlxrrsdpsufy
parent: pqm at pqm.ubuntu.com-20080709135859-wq3r1d1fjcafelgw
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.init-verbose
timestamp: Sun 2008-07-13 10:43:42 +0200
message:
print info after init and init-repo
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3619.1.13
revision-id: pqm at pqm.ubuntu.com-20080814182509-9f2dz3kcb1lv5lku
parent: pqm at pqm.ubuntu.com-20080814175522-mho538328p19v77a
parent: john at arbash-meinel.com-20080814170306-ucffga2qhv6kwgju
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-14 19:25:09 +0100
message:
(robertc) Trigger index._buffer_all when a significant portion of the
index is being queried.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
------------------------------------------------------------
revno: 3619.8.2
revision-id: john at arbash-meinel.com-20080814170306-ucffga2qhv6kwgju
parent: robertc at robertcollins.net-20080814042150-n13mos3tt90xw2rp
parent: pqm at pqm.ubuntu.com-20080814074117-x0zvzzv7y6mok8pz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2008-08-14 12:03:06 -0500
message:
Merge in bzr.dev, resolve NEWS
added:
doc/en/developer-guide/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
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/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
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/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3619.8.1
revision-id: robertc at robertcollins.net-20080814042150-n13mos3tt90xw2rp
parent: pqm at pqm.ubuntu.com-20080812201855-9qxbdo0t2h9byzhj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: index.trigger
timestamp: Thu 2008-08-14 14:21:50 +1000
message:
Cause a full index read when a single index query is larger than 1/20th the index capacity.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
------------------------------------------------------------
revno: 3619.1.12
revision-id: pqm at pqm.ubuntu.com-20080814175522-mho538328p19v77a
parent: pqm at pqm.ubuntu.com-20080814172543-nl22gdcodusa8rt0
parent: john at arbash-meinel.com-20080814165925-tg8kwwp6vagaq7tv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-14 18:55:22 +0100
message:
(Adrian Wilkins) Use osutils.pathjoin() rather than os.path.join() to
set the base directory for tests
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3613.3.5
revision-id: john at arbash-meinel.com-20080814165925-tg8kwwp6vagaq7tv
parent: adrian.wilkins at gmail.com-20080808083626-b5s7pwjxhtpsdgnr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: base_test_path
timestamp: Thu 2008-08-14 11:59:25 -0500
message:
use the right notation for pathjoin.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3613.3.4
revision-id: adrian.wilkins at gmail.com-20080808083626-b5s7pwjxhtpsdgnr
parent: adrian.wilkins at gmail.com-20080807165131-ckgunbopmmg0kown
committer: Adrian Wilkins <adrian.wilkins at gmail.com>
branch nick: bzr.base_test_path_win32
timestamp: Fri 2008-08-08 09:36:26 +0100
message:
Use pathjoin instead of joinpath just in case anyone ever uses `..`
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3613.3.3
revision-id: adrian.wilkins at gmail.com-20080807165131-ckgunbopmmg0kown
parent: adrian.wilkins at gmail.com-20080807162141-ypgdgc2l26tuz9p3
committer: Adrian Wilkins <adrian.wilkins at gmail.com>
branch nick: bzr.base_test_path_win32
timestamp: Thu 2008-08-07 17:51:31 +0100
message:
Correctly use osutils.joinpath instead of trying to use non-existent osutils.join()
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3613.3.2
revision-id: adrian.wilkins at gmail.com-20080807162141-ypgdgc2l26tuz9p3
parent: adrian.wilkins at gmail.com-20080807153130-bcr87cssqdsdwjtf
committer: Adrian Wilkins <adrian.wilkins at gmail.com>
branch nick: bzr.base_test_path_win32
timestamp: Thu 2008-08-07 17:21:41 +0100
message:
Changed to osutils.join as suggested
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3613.3.1
revision-id: adrian.wilkins at gmail.com-20080807153130-bcr87cssqdsdwjtf
parent: pqm at pqm.ubuntu.com-20080807005717-qxnuq9je71bt9tcs
committer: Adrian Wilkins <adrian.wilkins at gmail.com>
branch nick: bzr.base_test_path_win32
timestamp: Thu 2008-08-07 16:31:30 +0100
message:
Changed the base directory setup to use urlutils.join instead of os.path.join
It's a small thing, but on win32, any tests that examine the absolute path of
files will fail because they see a backslash where they were expecting a slash.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3619.1.11
revision-id: pqm at pqm.ubuntu.com-20080814172543-nl22gdcodusa8rt0
parent: pqm at pqm.ubuntu.com-20080814074117-x0zvzzv7y6mok8pz
parent: robertc at robertcollins.net-20080813233851-73a632ulysjb935c
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-14 18:25:43 +0100
message:
(robertc) Disable .bzrrules from being read from the WT
------------------------------------------------------------
revno: 3619.7.2
revision-id: robertc at robertcollins.net-20080813233851-73a632ulysjb935c
parent: robertc at robertcollins.net-20080813233044-84ad8vlkzl1lhnw2
committer: Robert Collins <robertc at robertcollins.net>
branch nick: rules.disable
timestamp: Thu 2008-08-14 09:38:51 +1000
message:
More doc updates.
modified:
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
------------------------------------------------------------
revno: 3619.7.1
revision-id: robertc at robertcollins.net-20080813233044-84ad8vlkzl1lhnw2
parent: pqm at pqm.ubuntu.com-20080812201855-9qxbdo0t2h9byzhj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: rules.disable
timestamp: Thu 2008-08-14 09:30:44 +1000
message:
Disable .bzrrules in-tree lookup for now.
modified:
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
------------------------------------------------------------
revno: 3619.1.10
revision-id: pqm at pqm.ubuntu.com-20080814074117-x0zvzzv7y6mok8pz
parent: pqm at pqm.ubuntu.com-20080814042250-v7qws60l3fjwelb1
parent: robertc at robertcollins.net-20080814065435-73xgy9r6xtqmvzux
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-14 08:41:17 +0100
message:
(robertc) Improve the testing of InterTree.iter_changes and fix bugs
found as a result (Robert Collins, Aaron Bentley)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3620.1.3
revision-id: robertc at robertcollins.net-20080814065435-73xgy9r6xtqmvzux
parent: robertc at robertcollins.net-20080814064629-wuzmbxzw7tn27usi
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2008-08-14 16:54:35 +1000
message:
Review feedback.
modified:
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
------------------------------------------------------------
revno: 3620.1.2
revision-id: robertc at robertcollins.net-20080814064629-wuzmbxzw7tn27usi
parent: robertc at robertcollins.net-20080814052902-1e5a6qm37sqhs2ji
parent: pqm at pqm.ubuntu.com-20080814042250-v7qws60l3fjwelb1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Thu 2008-08-14 16:46:29 +1000
message:
Resolve conflicts in NEWS.
added:
doc/en/developer-guide/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
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/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3620.1.1
revision-id: robertc at robertcollins.net-20080814052902-1e5a6qm37sqhs2ji
parent: robertc at robertcollins.net-20080813032119-09pl9q0t9gxng5t6
committer: Robert Collins <robertc at robertcollins.net>
branch nick: intertree.missing
timestamp: Thu 2008-08-14 15:29:02 +1000
message:
Change bzrlib.diff.DiffTree.show_diff to skip entries missing in both trees.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
------------------------------------------------------------
revno: 3619.1.9
revision-id: pqm at pqm.ubuntu.com-20080814042250-v7qws60l3fjwelb1
parent: pqm at pqm.ubuntu.com-20080814035325-ikgddts7pv17l23e
parent: andrew.bennetts at canonical.com-20080814021531-3axt0ak75mpxobrk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-14 05:22:50 +0100
message:
(spiv) Fix a regression in bzr+http:// where http wasn't implementing
a necessary function.
modified:
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
------------------------------------------------------------
revno: 3606.4.1
revision-id: andrew.bennetts at canonical.com-20080814021531-3axt0ak75mpxobrk
parent: pqm at pqm.ubuntu.com-20080805202941-gdv30kq4cign8fs4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: hpss-http-bug
timestamp: Thu 2008-08-14 12:15:31 +1000
message:
Fix NotImplementedError when probing for smart protocol via HTTP.
modified:
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/tests/http_utils.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
------------------------------------------------------------
revno: 3619.1.8
revision-id: pqm at pqm.ubuntu.com-20080814035325-ikgddts7pv17l23e
parent: pqm at pqm.ubuntu.com-20080814032324-mhfk4rggo7hgxeuf
parent: john at arbash-meinel.com-20080814030842-fuc2xackfdyatf42
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-14 04:53:25 +0100
message:
(robertc) Disable reading .bzrrules from the working tree.
modified:
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
------------------------------------------------------------
revno: 3606.2.5
revision-id: john at arbash-meinel.com-20080814030842-fuc2xackfdyatf42
parent: pqm at pqm.ubuntu.com-20080813185456-kn2cq6pkj6h52z9k
author: Robert Collins <robertc at robertcollins.net>
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2008-08-13 22:08:42 -0500
message:
Cherry pick Robert's 'disable .bzrrules in-tree' patch
modified:
bzrlib/help_topics/en/rules.txt rules.txt-20080516063844-ghr5l6pvvrhiycun-1
bzrlib/tests/tree_implementations/test_iter_search_rules.py test_iter_search_rul-20080528065532-1ml1ttb12az20cxf-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
doc/en/user-guide/configuring_bazaar.txt configuring_bazaar.t-20071128000722-ncxiua259xwbdbg7-1
------------------------------------------------------------
revno: 3619.1.7
revision-id: pqm at pqm.ubuntu.com-20080814032324-mhfk4rggo7hgxeuf
parent: pqm at pqm.ubuntu.com-20080813232540-mgtcd9chtkd9kda0
parent: mhammond at skippinet.com.au-20080814014130-ohoxsrqy94jldajv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-14 04:23:24 +0100
message:
(Mark Hammond) Updates to setup.py to support bundling tortoisebzr
and qbzr into the standalone win32 installer.
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3565.5.9
revision-id: mhammond at skippinet.com.au-20080814014130-ohoxsrqy94jldajv
parent: mhammond at skippinet.com.au-20080813233916-co6sjx89hnu9pgfe
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.win32binary.tbzr-setup
timestamp: Thu 2008-08-14 11:41:30 +1000
message:
Address John's review comments
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3565.5.8
revision-id: mhammond at skippinet.com.au-20080813233916-co6sjx89hnu9pgfe
parent: mhammond at skippinet.com.au-20080810111639-9upz1wig1s8lvz62
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.win32binary.tbzr-setup
timestamp: Thu 2008-08-14 09:39:16 +1000
message:
s/TBZR/Tortoise/ in the Inno status messages.
modified:
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3565.5.7
revision-id: mhammond at skippinet.com.au-20080810111639-9upz1wig1s8lvz62
parent: mhammond at skippinet.com.au-20080731070112-aafagt2n4lax4977
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.win32binary.tbzr-setup
timestamp: Sun 2008-08-10 21:16:39 +1000
message:
install all files with 'restartreplace uninsrestartdelete' and close
tbzrcache at uninstall time.
modified:
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3565.5.6
revision-id: mhammond at skippinet.com.au-20080731070112-aafagt2n4lax4977
parent: mhammond at skippinet.com.au-20080731065534-n0jl9z7sim2lj36z
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.win32binary.tbzr-setup
timestamp: Thu 2008-07-31 17:01:12 +1000
message:
move tbzr and qbzr py2exe config code into their own functions.
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3565.5.5
revision-id: mhammond at skippinet.com.au-20080731065534-n0jl9z7sim2lj36z
parent: mhammond at skippinet.com.au-20080731053858-rzby1lwoufgoocww
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.win32binary.tbzr-setup
timestamp: Thu 2008-07-31 16:55:34 +1000
message:
paramiko has applied a patch making win32ui unnecessary and the wiki has
been updated with the defails, so checking for that dll can be removed.
modified:
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3565.5.4
revision-id: mhammond at skippinet.com.au-20080731053858-rzby1lwoufgoocww
parent: mhammond at skippinet.com.au-20080731053215-3cu1wwxigtyu1kml
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.win32binary.tbzr-setup
timestamp: Thu 2008-07-31 15:38:58 +1000
message:
byte-compile plugins; tweaks so qbzr and bzrsvn can be packaged.
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3565.5.3
revision-id: mhammond at skippinet.com.au-20080731053215-3cu1wwxigtyu1kml
parent: mhammond at skippinet.com.au-20080722105302-027b8v2xx2ts1iai
parent: pqm at pqm.ubuntu.com-20080730213059-hcremsawwvcqjcj1
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.win32binary.tbzr-setup
timestamp: Thu 2008-07-31 15:32:15 +1000
message:
merge
added:
doc/developers/ppa.txt ppa.txt-20080722055539-606u7t2z32t3ae4w-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
bzrlib/_patiencediff_py.py cdvdifflib.py-20051106064558-f8f8097fbf0db4e4
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/branchbuilder.py branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/export/dir_exporter.py dir_exporter.py-20051114235828-b51397f56bc7b117
bzrlib/export/tar_exporter.py tar_exporter.py-20051114235828-1f6349a2f090a5d0
bzrlib/export/zip_exporter.py zip_exporter.py-20051114235828-8f57f954fba6497e
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
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_check.py test_check.py-20071024054728-mn44rt3z5hnqcbke-1
bzrlib/tests/blackbox/test_export.py test_export.py-20051229024010-e6c26658e460fb1c
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
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/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_memorytree.py test_memorytree.py-20060906023413-4wlkalbdpsxi2r4y-3
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
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_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
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
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/releasing.txt releasing.txt-20080502015919-fnrcav8fwy8ccibu-1
tools/doc_generate/autodoc_rstx.py autodoc_rstx.py-20060420024836-3e0d4a526452193c
------------------------------------------------------------
revno: 3565.5.2
revision-id: mhammond at skippinet.com.au-20080722105302-027b8v2xx2ts1iai
parent: mhammond at skippinet.com.au-20080722090655-k7uicuhkin9wgf1u
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.win32binary.tbzr-setup
timestamp: Tue 2008-07-22 20:53:02 +1000
message:
merge inno script changes
modified:
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3565.5.1
revision-id: mhammond at skippinet.com.au-20080722090655-k7uicuhkin9wgf1u
parent: pqm at pqm.ubuntu.com-20080718100017-segv2csk7ux2xs9p
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.win32binary.tbzr-setup
timestamp: Tue 2008-07-22 19:06:55 +1000
message:
merge setup.py changes for tbzr
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3619.1.6
revision-id: pqm at pqm.ubuntu.com-20080813232540-mgtcd9chtkd9kda0
parent: pqm at pqm.ubuntu.com-20080813064214-jc5n4sj20j81qcwy
parent: john at arbash-meinel.com-20080813225155-t914z2fqyi072dd4
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-08-14 00:25:40 +0100
message:
(jam) Bring 1.6rc2 back into bzr.dev, and fix up NEWS entries.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3619.6.1
revision-id: john at arbash-meinel.com-20080813225155-t914z2fqyi072dd4
parent: pqm at pqm.ubuntu.com-20080813064214-jc5n4sj20j81qcwy
parent: pqm at pqm.ubuntu.com-20080813185456-kn2cq6pkj6h52z9k
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2008-08-13 17:51:55 -0500
message:
Bring in 1.6rc2, and update NEWS.
Some things that were IN DEVELOPMENT were released in bzr 1.6rc2.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3606.2.4
revision-id: pqm at pqm.ubuntu.com-20080813185456-kn2cq6pkj6h52z9k
parent: pqm at pqm.ubuntu.com-20080813171514-ukw1ll8hhtge74z8
parent: john at arbash-meinel.com-20080813182409-gdaw15ylafacc173
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Wed 2008-08-13 19:54:56 +0100
message:
(jam) Fix handling of ENOTDIR for win32,
and prepare the 1.6rc2 release.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3596.2.6
revision-id: john at arbash-meinel.com-20080813182409-gdaw15ylafacc173
parent: john at arbash-meinel.com-20080813173534-0kb0kr70q505ihph
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_enotdir
timestamp: Wed 2008-08-13 13:24:09 -0500
message:
Turns out that osutils wasn't imported directly into transform
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3596.2.5
revision-id: john at arbash-meinel.com-20080813173534-0kb0kr70q505ihph
parent: john at arbash-meinel.com-20080813173115-mj34cv2uoxrnw32n
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_enotdir
timestamp: Wed 2008-08-13 12:35:34 -0500
message:
Fix up NEWS and version info to prepare 1.6rc2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3596.2.4
revision-id: john at arbash-meinel.com-20080813173115-mj34cv2uoxrnw32n
parent: john at arbash-meinel.com-20080813172516-mlg6z6anklyrq21j
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_enotdir
timestamp: Wed 2008-08-13 12:31:15 -0500
message:
NEWS entries for the various bugfixes merged
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3596.2.3
revision-id: john at arbash-meinel.com-20080813172516-mlg6z6anklyrq21j
parent: john at arbash-meinel.com-20080813160710-ns4og8r4y6xcmp0b
parent: pqm at pqm.ubuntu.com-20080813171514-ukw1ll8hhtge74z8
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_enotdir
timestamp: Wed 2008-08-13 12:25:16 -0500
message:
Merge in 1.6 tip
added:
bzrlib/tests/test_pack_repository.py test_pack_repository-20080801043947-eaw0e6h2gu75kwmy-1
bzrlib/tests/test_upgrade_stacked.py test_upgrade_stacked-20080804072225-jd13yami19nskns5-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/branch_implementations/test_stacking.py test_stacking.py-20080214020755-msjlkb7urobwly0f-1
bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_tree.py test_tree.py-20060724065232-khgrr0vvmt6ih0mi-1
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
------------------------------------------------------------
revno: 3596.2.2
revision-id: john at arbash-meinel.com-20080813160710-ns4og8r4y6xcmp0b
parent: mhammond at skippinet.com.au-20080809050006-5sf16g2b7eijnkwz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2008-08-13 11:07:10 -0500
message:
Factor out the common exception handling looking for ENOTDIR and use it
for osutils.walkdirs() and tree transform code.
modified:
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3596.2.1
revision-id: mhammond at skippinet.com.au-20080809050006-5sf16g2b7eijnkwz
parent: pqm at pqm.ubuntu.com-20080730213059-hcremsawwvcqjcj1
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests
timestamp: Sat 2008-08-09 15:00:06 +1000
message:
Correctly catch and handle os.listdir errors on Windows
modified:
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3606.2.3
revision-id: pqm at pqm.ubuntu.com-20080813171514-ukw1ll8hhtge74z8
parent: pqm at pqm.ubuntu.com-20080813150626-htj2l5by2vy2uol1
parent: aaron at aaronbentley.com-20080813140357-w4n79too1x2c749k
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Wed 2008-08-13 18:15:14 +0100
message:
(Aaron Bentley) Update repo format strings
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 3606.3.1
revision-id: aaron at aaronbentley.com-20080813140357-w4n79too1x2c749k
parent: pqm at pqm.ubuntu.com-20080806081305-xvxw50wzvr47315q
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzr.1.6
timestamp: Wed 2008-08-13 10:03:57 -0400
message:
Update repo format strings
modified:
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
------------------------------------------------------------
revno: 3606.2.2
revision-id: pqm at pqm.ubuntu.com-20080813150626-htj2l5by2vy2uol1
parent: pqm at pqm.ubuntu.com-20080806081305-xvxw50wzvr47315q
parent: jelmer at samba.org-20080809004530-v2g6mrvl4bc1tae1
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Wed 2008-08-13 16:06:26 +0100
message:
(Jelmer) Fix a smal bug in Inventory.copy()
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_tsort.py testtsort.py-20051025073946-27da871c394d5be4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
------------------------------------------------------------
revno: 3619.1.5
revision-id: pqm at pqm.ubuntu.com-20080813064214-jc5n4sj20j81qcwy
parent: pqm at pqm.ubuntu.com-20080813033958-o4nve9kwgoa1nlir
parent: andrew.bennetts at canonical.com-20080813053026-z5zul3vg110232n1
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-08-13 07:42:14 +0100
message:
Move the notes on writing tests out of HACKING into a new file,
and improve them. (Andrew Bennetts)
added:
doc/en/developer-guide/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3619.5.2
revision-id: andrew.bennetts at canonical.com-20080813053026-z5zul3vg110232n1
parent: andrew.bennetts at canonical.com-20080812145326-yx693x2jc4rcovb7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: HACKING updates
timestamp: Wed 2008-08-13 15:30:26 +1000
message:
Remove references to unimplemented TestPlatformLimit, remove some redundant (and misplaced) text from 'Test feature dependencies'.
modified:
doc/en/developer-guide/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
------------------------------------------------------------
revno: 3619.5.1
revision-id: andrew.bennetts at canonical.com-20080812145326-yx693x2jc4rcovb7
parent: pqm at pqm.ubuntu.com-20080811083307-tbibm26paa3r4hg8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: HACKING updates
timestamp: Wed 2008-08-13 00:53:26 +1000
message:
Move the notes on writing tests out of HACKING into a new file, and improve
them.
Many of the testing notes in the HACKING file were in duplicated in two places
in that file! This change removes that duplication. It also adds new sections
on “Where should I put a new test?†and “TestCase and its subclassesâ€, and
others like “Test feature dependencies†have been expanded. The whole document
has generally been edited to be a bit more coherent.
added:
doc/en/developer-guide/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3619.1.4
revision-id: pqm at pqm.ubuntu.com-20080813033958-o4nve9kwgoa1nlir
parent: pqm at pqm.ubuntu.com-20080813025404-kmul7igvg0d7w4va
parent: aaron at aaronbentley.com-20080812141923-khi07xuwwi6gnm86
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-08-13 04:39:58 +0100
message:
Refactor TreeTransform to extract _generate_inventory_delta (abentley)
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3619.4.11
revision-id: aaron at aaronbentley.com-20080812141923-khi07xuwwi6gnm86
parent: aaron at aaronbentley.com-20080812140341-nytxmmhztdg5zxfh
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: separate-delta
timestamp: Tue 2008-08-12 10:19:23 -0400
message:
Tweak new_paths logic
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3619.4.10
revision-id: aaron at aaronbentley.com-20080812140341-nytxmmhztdg5zxfh
parent: aaron at aaronbentley.com-20080812130646-d74yxibi8fm4n40g
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: separate-delta
timestamp: Tue 2008-08-12 10:03:41 -0400
message:
Compensate for stale entries in TT._needs_rename
modified:
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3619.4.9
revision-id: aaron at aaronbentley.com-20080812130646-d74yxibi8fm4n40g
parent: aaron at aaronbentley.com-20080812130323-drs3nke90pq02t5g
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: separate-delta
timestamp: Tue 2008-08-12 09:06:46 -0400
message:
Update docs
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3619.4.8
revision-id: aaron at aaronbentley.com-20080812130323-drs3nke90pq02t5g
parent: abentley at stumpy-20080812073116-qrnxjlrjyozq270v
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: separate-delta
timestamp: Tue 2008-08-12 09:03:23 -0400
message:
Reorganize execute-bit handling
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3619.4.7
revision-id: abentley at stumpy-20080812073116-qrnxjlrjyozq270v
parent: aaron at aaronbentley.com-20080812062153-dxnnuq4s8di98xob
committer: Aaron Bentley <abentley at stumpy>
branch nick: separate-delta
timestamp: Tue 2008-08-12 03:31:16 -0400
message:
Fix progress handling
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3619.4.6
revision-id: aaron at aaronbentley.com-20080812062153-dxnnuq4s8di98xob
parent: aaron at aaronbentley.com-20080812061438-bc1hxhxz0fd829qw
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: separate-delta
timestamp: Tue 2008-08-12 02:21:53 -0400
message:
More tweaking
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3619.4.5
revision-id: aaron at aaronbentley.com-20080812061438-bc1hxhxz0fd829qw
parent: aaron at aaronbentley.com-20080812055617-p3womlx16jei3sgf
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: separate-delta
timestamp: Tue 2008-08-12 02:14:38 -0400
message:
Reduce set tests
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3619.4.4
revision-id: aaron at aaronbentley.com-20080812055617-p3womlx16jei3sgf
parent: aaron at aaronbentley.com-20080812044904-gjotd2kgh2i3675n
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: separate-delta
timestamp: Tue 2008-08-12 01:56:17 -0400
message:
Further restructuring
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3619.4.3
revision-id: aaron at aaronbentley.com-20080812044904-gjotd2kgh2i3675n
parent: aaron at aaronbentley.com-20080812041312-ydtwxp53d1jjwvky
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: separate-delta
timestamp: Tue 2008-08-12 00:49:04 -0400
message:
Remove unused code
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3619.4.2
revision-id: aaron at aaronbentley.com-20080812041312-ydtwxp53d1jjwvky
parent: aaron at aaronbentley.com-20080812033329-9t2sw9fve78ri7hy
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: separate-delta
timestamp: Tue 2008-08-12 00:13:12 -0400
message:
Further cleanup
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3619.4.1
revision-id: aaron at aaronbentley.com-20080812033329-9t2sw9fve78ri7hy
parent: pqm at pqm.ubuntu.com-20080811083307-tbibm26paa3r4hg8
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: separate-delta
timestamp: Mon 2008-08-11 23:33:29 -0400
message:
Refactor inventory delta generation out of apply_insersions/removals
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3619.1.3
revision-id: pqm at pqm.ubuntu.com-20080813025404-kmul7igvg0d7w4va
parent: pqm at pqm.ubuntu.com-20080813020322-v230uatfihz5zfm6
parent: jml at canonical.com-20080813021301-9n2qhopsv5jk929r
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-08-13 03:54:04 +0100
message:
Allow addCleanup to take arguments,
and remove addCleanup's uniqueness constraint. (Jonathan Lange)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3619.3.2
revision-id: jml at canonical.com-20080813021301-9n2qhopsv5jk929r
parent: jml at canonical.com-20080813013046-b9voimnnr9eghlbz
committer: Jonathan Lange <jml at canonical.com>
branch nick: addCleanup-args
timestamp: Wed 2008-08-13 12:13:01 +1000
message:
Add an entry for addCleanup changes.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3619.3.1
revision-id: jml at canonical.com-20080813013046-b9voimnnr9eghlbz
parent: pqm at pqm.ubuntu.com-20080812201855-9qxbdo0t2h9byzhj
committer: Jonathan Lange <jml at canonical.com>
branch nick: addCleanup-args
timestamp: Wed 2008-08-13 11:30:46 +1000
message:
Let addCleanup take arguments that are then passed to the cleanup.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3619.1.2
revision-id: pqm at pqm.ubuntu.com-20080813020322-v230uatfihz5zfm6
parent: pqm at pqm.ubuntu.com-20080812201855-9qxbdo0t2h9byzhj
parent: robertc at robertcollins.net-20080813013031-ghubj7wij3nsg0sw
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-08-13 03:03:22 +0100
message:
(robertc) Tighten up the handling of carried over inventory entries.
(Robert Collins)
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3619.2.2
revision-id: robertc at robertcollins.net-20080813013031-ghubj7wij3nsg0sw
parent: robertc at robertcollins.net-20080812071929-jf7qv5f2v7any84b
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-256409
timestamp: Wed 2008-08-13 11:30:31 +1000
message:
Review feedback.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3619.2.1
revision-id: robertc at robertcollins.net-20080812071929-jf7qv5f2v7any84b
parent: pqm at pqm.ubuntu.com-20080811083307-tbibm26paa3r4hg8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: bug-256409
timestamp: Tue 2008-08-12 17:19:29 +1000
message:
Tighten up the handling of carried-over inventory entries.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3619.1.1
revision-id: pqm at pqm.ubuntu.com-20080812201855-9qxbdo0t2h9byzhj
parent: pqm at pqm.ubuntu.com-20080811083307-tbibm26paa3r4hg8
parent: mhammond at skippinet.com.au-20080812022136-vmynpj251uflufyb
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-08-12 21:18:55 +0100
message:
(Mark Hammond) Win32 test fixes
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
------------------------------------------------------------
revno: 3616.2.12
revision-id: mhammond at skippinet.com.au-20080812022136-vmynpj251uflufyb
parent: mhammond at skippinet.com.au-20080811125016-da5gx8vxab0izs0p
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.blackbox
timestamp: Tue 2008-08-12 12:21:36 +1000
message:
use osutils.realpath instead of os.path.realpath so we get fwd slashes.
modified:
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3616.2.11
revision-id: mhammond at skippinet.com.au-20080811125016-da5gx8vxab0izs0p
parent: mhammond at skippinet.com.au-20080811023244-qfb1rhqlcpecz3f2
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.blackbox
timestamp: Mon 2008-08-11 22:50:16 +1000
message:
3rd go at test_set_plugins_path_with_trailing_slashes in a Windows
binary! This time just do what the test says it does (trailing slashes)
and don't try to predict anything about the rest of the path.
modified:
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
------------------------------------------------------------
revno: 3616.2.10
revision-id: mhammond at skippinet.com.au-20080811023244-qfb1rhqlcpecz3f2
parent: mhammond at skippinet.com.au-20080811021449-pa1k1smny3l631r6
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.blackbox
timestamp: Mon 2008-08-11 12:32:44 +1000
message:
docstring for transport.local.local_abspath() avoids potential confusion
about the path seps in the return value.
modified:
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
------------------------------------------------------------
revno: 3616.2.9
revision-id: mhammond at skippinet.com.au-20080811021449-pa1k1smny3l631r6
parent: mhammond at skippinet.com.au-20080811020443-koy7d1dhucshppkv
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.blackbox
timestamp: Mon 2008-08-11 12:14:49 +1000
message:
Make it clear the paths differ only by the path sep.
modified:
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3616.2.8
revision-id: mhammond at skippinet.com.au-20080811020443-koy7d1dhucshppkv
parent: mhammond at skippinet.com.au-20080811020400-7mnjrjl02b5w9uzf
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.blackbox
timestamp: Mon 2008-08-11 12:04:43 +1000
message:
make plugin test clearer and simpler.
modified:
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
------------------------------------------------------------
revno: 3616.2.7
revision-id: mhammond at skippinet.com.au-20080811020400-7mnjrjl02b5w9uzf
parent: mhammond at skippinet.com.au-20080810112650-ggmv29q5pj4tipxx
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.blackbox
timestamp: Mon 2008-08-11 12:04:00 +1000
message:
prefer getattr() over hasattr()
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
------------------------------------------------------------
revno: 3616.2.6
revision-id: mhammond at skippinet.com.au-20080810112650-ggmv29q5pj4tipxx
parent: mhammond at skippinet.com.au-20080810104637-6fx12scg4op1wbls
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.blackbox
timestamp: Sun 2008-08-10 21:26:50 +1000
message:
Fix test_set_user_setting_sets_and_saves2 on windows by stripping EOL
modified:
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
------------------------------------------------------------
revno: 3616.2.5
revision-id: mhammond at skippinet.com.au-20080810104637-6fx12scg4op1wbls
parent: mhammond at skippinet.com.au-20080810080119-u13jb505t813vi3k
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.blackbox
timestamp: Sun 2008-08-10 20:46:37 +1000
message:
don't try and test source code when we are frozen.
modified:
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
------------------------------------------------------------
revno: 3616.2.4
revision-id: mhammond at skippinet.com.au-20080810080119-u13jb505t813vi3k
parent: mhammond at skippinet.com.au-20080810070059-w9sml0t600ayirto
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.blackbox
timestamp: Sun 2008-08-10 18:01:19 +1000
message:
fix test_set_plugins_path_with_trailing_slashes in windows binaries
modified:
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
------------------------------------------------------------
revno: 3616.2.3
revision-id: mhammond at skippinet.com.au-20080810070059-w9sml0t600ayirto
parent: mhammond at skippinet.com.au-20080810065533-qesggahuxwh189ea
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.blackbox
timestamp: Sun 2008-08-10 17:00:59 +1000
message:
Fix test failures due to missing check_repo_format_for_funky_id_on_win32
modified:
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
------------------------------------------------------------
revno: 3616.2.2
revision-id: mhammond at skippinet.com.au-20080810065533-qesggahuxwh189ea
parent: mhammond at skippinet.com.au-20080809073744-9rifv2fv3ygu052a
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.blackbox
timestamp: Sun 2008-08-10 16:55:33 +1000
message:
Fix test_bzrdir.ChrootedTests on Windows by ensuring paths always go
via os.path.realpath() before being compared.
modified:
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
------------------------------------------------------------
revno: 3616.2.1
revision-id: mhammond at skippinet.com.au-20080809073744-9rifv2fv3ygu052a
parent: pqm at pqm.ubuntu.com-20080808061719-ixk3x48n198814tg
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.blackbox
timestamp: Sat 2008-08-09 17:37:44 +1000
message:
Fix how blackbox tests start bzr from frozen executables.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
Diff too large for email (2866 lines, the limit is 1000).
More information about the bazaar-commits
mailing list