Rev 2601: merge trunk in http://sourcefrog.net/bzr/progress
Martin Pool
mbp at sourcefrog.net
Fri Jul 13 00:09:57 BST 2007
At http://sourcefrog.net/bzr/progress
------------------------------------------------------------
revno: 2601
revision-id: mbp at sourcefrog.net-20070712230951-u8vscn58t8fwtfuw
parent: mbp at sourcefrog.net-20070711064730-pwnhisgp2caf7nar
parent: pqm at pqm.ubuntu.com-20070712133554-r8me4pz4j68p2ytf
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: progress
timestamp: Fri 2007-07-13 09:09:51 +1000
message:
merge trunk
added:
bzrlib/tests/blackbox/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-1
bzrlib/tests/repository_implementations/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-2
bzrlib/tests/workingtree_implementations/test_uncommit.py test_uncommit.py-20070712063057-8zaprw7t7lcqxeje-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/branch_implementations/test_revision_id_to_revno.py test_revision_id_to_-20070417200738-lo776wkqikhe5goo-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
------------------------------------------------------------
revno: 2599.1.11
revision-id: pqm at pqm.ubuntu.com-20070712133554-r8me4pz4j68p2ytf
parent: pqm at pqm.ubuntu.com-20070712124245-vaw0ajlwrexg8d0m
parent: robertc at robertcollins.net-20070712120713-c2vfm2n61l63wt6s
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-12 14:35:54 +0100
message:
(robertc) Introduce a pack command.
added:
bzrlib/tests/blackbox/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-1
bzrlib/tests/repository_implementations/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
------------------------------------------------------------
revno: 2599.1.5.2.1
revision-id: robertc at robertcollins.net-20070712120713-c2vfm2n61l63wt6s
parent: pqm at pqm.ubuntu.com-20070712075207-pgz7ur4rxmklmrxr
committer: Robert Collins <robertc at robertcollins.net>
branch nick: pack
timestamp: Thu 2007-07-12 22:07:13 +1000
message:
(robertc) Introduce a pack command.
added:
bzrlib/tests/blackbox/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-1
bzrlib/tests/repository_implementations/test_pack.py test_pack.py-20070712120702-0c7585lh56p894mo-2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
------------------------------------------------------------
revno: 2599.1.10
revision-id: pqm at pqm.ubuntu.com-20070712124245-vaw0ajlwrexg8d0m
parent: pqm at pqm.ubuntu.com-20070712114408-7iozx4b8hq8ts24n
parent: mbp at sourcefrog.net-20070712101425-tpdmq32cjezsmrsc
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-12 13:42:45 +0100
message:
(marius,r=robert,r=mbp) Fix rm of renamed files
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2599.1.6.1.2
revision-id: mbp at sourcefrog.net-20070712101425-tpdmq32cjezsmrsc
parent: mbp at sourcefrog.net-20070712092621-y3rt81f3t6rvcfnx
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: rm-renamed
timestamp: Thu 2007-07-12 20:14:25 +1000
message:
Fix up run_bzr calls
modified:
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
------------------------------------------------------------
revno: 2599.1.6.1.1
revision-id: mbp at sourcefrog.net-20070712092621-y3rt81f3t6rvcfnx
parent: pqm at pqm.ubuntu.com-20070712085245-afvocysw990c1a3z
parent: marius.kruger at enerweb.co.za-20070628061106-dw6t7vpj0hlo3461
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: rm-renamed
timestamp: Thu 2007-07-12 19:26:21 +1000
message:
Merge fix for rm renamed files
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2475.5.6
revision-id: marius.kruger at enerweb.co.za-20070628061106-dw6t7vpj0hlo3461
parent: marius.kruger at enerweb.co.za-20070627184810-4jq1y5f20xafow9w
committer: Marius Kruger <marius.kruger at enerweb.co.za>
branch nick: bzr.fix_bug_111664
timestamp: Thu 2007-06-28 08:11:06 +0200
message:
* test_remove
- Remove redundant method _assertRemoveErrorContainsRe and update the test
which used to use it.
modified:
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
------------------------------------------------------------
revno: 2475.5.5
revision-id: marius.kruger at enerweb.co.za-20070627184810-4jq1y5f20xafow9w
parent: amanic at gmail.com-20070623194517-9kgydu5fgjtzmu7m
parent: pqm at pqm.ubuntu.com-20070627080723-ci6ghe3bsm0snyit
committer: Marius Kruger <marius.kruger at enerweb.co.za>
branch nick: bzr.fix_bug_111664
timestamp: Wed 2007-06-27 20:48:10 +0200
message:
Merge with bzr.dev
added:
bzrlib/api.py api.py-20070626082640-35lspz7j0ys7a8ld-1
bzrlib/smtp_connection.py smtp_connection.py-20070618204456-nu6wag1ste4biuk2-1
bzrlib/tests/test_smtp_connection.py test_smtp_connection-20070618204509-wuyxc0r0ztrecv7e-1
doc/developers/api-versioning.txt apiversioning.txt-20070626065626-iiihgmhgkv91uphz-1
doc/developers/dirstate.txt dirstate.txt-20070618020404-cdhv0ecgrukomemg-2
doc/developers/scratch.txt scratch.txt-20070618020404-cdhv0ecgrukomemg-3
doc/developers/uncommit.txt uncommit.txt-20070621042721-4clw8ucb9u9yda2h-1
renamed:
doc/developers/performance-commit.txt => doc/developers/commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_add.py test_add.py-20060518072250-857e4f86f54a30b2
bzrlib/tests/blackbox/test_added.py test_added.py-20060119085008-6b8b90369d42a26c
bzrlib/tests/blackbox/test_ancestry.py test_ancestry.py-20060131142602-6d9524c490537e90
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_checkout.py test_checkout.py-20060211231752-a5cde67cf70af854
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_conflicts.py test_conflicts.py-20060228151432-9723ebb925b999cf
bzrlib/tests/blackbox/test_diff.py test_diff.py-20060110203741-aa99ac93e633d971
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_ignore.py test_ignore.py-20060703063225-4tm8dc2pa7wwg2t3-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/blackbox/test_nick.py test_nick.py-20061105141046-p7zovcsit44uj4w9-1
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/blackbox/test_revert.py test_revert.py-20060124160917-485ce9de629c182c
bzrlib/tests/blackbox/test_revision_history.py test_revision_history.py-20060530150249-i2szwjr5uioe9ujb-1
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/blackbox/test_too_much.py blackbox.py-20050620052131-a7370d756399f615
bzrlib/tests/blackbox/test_update.py test_update.py-20060212125639-c4dad1a5c56d5919
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/blackbox/test_versioning.py versioning.py-20050622071821-3ddf5e2e5e93c602
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_api.py testapi.py-20051027033546-6f9be2d308d18a52
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_smart_add.py test_smart_add.py-20050824235919-c60dcdb0c8e999ce
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance-use-case-analysis.txt performanceusecasean-20070508045640-zneiu1yzbci574c6-2
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
doc/developers/commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
------------------------------------------------------------
revno: 2475.5.4
revision-id: amanic at gmail.com-20070623194517-9kgydu5fgjtzmu7m
parent: amanic at gmail.com-20070623175922-9dlpr6bxipcklr8g
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.fix_bug_111664
timestamp: Sat 2007-06-23 21:45:17 +0200
message:
* Don't introduce more tests calling run_bzr with a non-list.
* Use more elegant way of ignoring new lines in test helper.
modified:
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
------------------------------------------------------------
revno: 2475.5.3
revision-id: amanic at gmail.com-20070623175922-9dlpr6bxipcklr8g
parent: amanic at gmail.com-20070506014714-9vp1redn0760c8ra
parent: pqm at pqm.ubuntu.com-20070622160825-17gv0lorkzbr3x76
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.fix_bug_111664
timestamp: Sat 2007-06-23 19:59:22 +0200
message:
merge with bzr.dev
added:
bzrlib/branchbuilder.py branchbuilder.py-20070427022007-zlxpqz2lannhk6y8-1
bzrlib/counted_lock.py counted_lock.py-20070502135927-7dk86io3ok7ctx6k-1
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/tests/blackbox/test_lsprof.py test_lsprof.py-20070622025641-nbsm2svy8anvj9df-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/test_branchbuilder.py test_branchbuilder.p-20070427022007-zlxpqz2lannhk6y8-2
bzrlib/tests/test_counted_lock.py test_counted_lock.py-20070502135927-7dk86io3ok7ctx6k-2
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_lsprof.py test_lsprof.py-20070606095601-bctdndm8yhc0cqnc-1
doc/developers/ docdevelopers-20070507164002-62r0es2b29myxges-1
doc/developers/add.txt add.txt-20070515094933-xhgz3xjc7o0edok0-2
doc/developers/annotate.txt annotate.txt-20070515142136-rq51c4kqhwrjsh8k-1
doc/developers/bundle-creation.txt bundlecreation.rst-20070527173558-rqaqxn1al7vzgcto-1
doc/developers/bundles.txt bundles.txt-20070621030528-qkjnugd7iyud6ow3-1
doc/developers/container-format.txt containerformat.txt-20070601074309-7n7w1jiyayud6xdn-1
doc/developers/gc.txt gc.txt-20070515102609-90x5kzjokrurfbke-1
doc/developers/incremental-push-pull.txt incrementalpushpull.-20070508045640-zneiu1yzbci574c6-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/initial-push-pull.txt initialpushpull.rst-20070527184539-wodba32mi5dehhct-1
doc/developers/merge-scaling.txt mergescaling.rst-20070527173558-rqaqxn1al7vzgcto-2
doc/developers/performance-commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
doc/developers/performance-roadmap-rationale.txt performanceroadmapra-20070507174912-mwv3xv517cs4sisd-1
doc/developers/performance-roadmap.txt performanceroadmap.t-20070507174912-mwv3xv517cs4sisd-2
doc/developers/performance-use-case-analysis.txt performanceusecasean-20070508045640-zneiu1yzbci574c6-2
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
doc/developers/planned-change-integration.txt plannedchangeintegra-20070619004702-i1b3ccamjtfaoq6w-1
doc/developers/planned-performance-changes.txt plannedperformancech-20070604053752-bnjdhako613xfufb-1
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
doc/developers/revert.txt revert.txt-20070515111013-grc9hgp21zxqbwbl-1
doc/shared_repository_layouts.txt shared_repository_la-20070502152030-bagewuqs18ns24o7-1
renamed:
HACKING => doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
bzrlib/graph.py => bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/tests/test_graph.py => bzrlib/tests/test_deprecated_graph.py testgraph.py-20050905070950-42e6c958106610fd
modified:
.bzrignore bzrignore-20050311232317-81f7b71efa2db11a
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
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/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/HTTPTestUtil.py HTTPTestUtil.py-20050914180604-247d3aafb7a43343
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_breakin.py test_breakin.py-20070424043903-qyy6zm4pj3h4sbp3-1
bzrlib/tests/blackbox/test_bundle.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/blackbox/test_find_merge_base.py test_find_merge_base.py-20060131142124-f9d5c94df4505b70
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_log.py test_log.py-20060112090212-78f6ea560c868e24
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
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_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_http.py testhttp.py-20051018020158-b2eef6e867c514d9
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_missing.py test_missing.py-20051212000028-694fa4f658a81f48
bzrlib/tests/test_msgeditor.py test_msgeditor.py-20051202041359-920315ec6011ee51
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_revert.py test_revert.py-20060828180832-fqb1v6ecpyvnlitj-1
bzrlib/tests/test_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport.py testtransport.py-20050718175618-e5cdb99f4555ddce
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_treebuilder.py test_treebuilder.py-20060907214856-4omn6hf1u7fvrart-2
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/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/tsort.py tsort.py-20051025073946-7808f6aaf7d07208
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/weave_commands.py weave_commands.py-20060320231507-8e9f300bffc1aa19
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
contrib/bash/bzr.simple bzr-20050503074841-dfc41af1e02111f9
doc/centralized_workflow.txt centralized_workflow-20060830194948-kspf52565xvgrlil-1
doc/default.css default.css-20060622101119-tgwtdci8z769bjb9-1
doc/index.txt index.txt-20060622101119-tgwtdci8z769bjb9-2
doc/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
bzrlib/deprecated_graph.py graph.py-20050905070950-b47dce53236c5e48
bzrlib/tests/test_deprecated_graph.py testgraph.py-20050905070950-42e6c958106610fd
------------------------------------------------------------
revno: 2475.5.2
revision-id: amanic at gmail.com-20070506014714-9vp1redn0760c8ra
parent: amanic at gmail.com-20070503071126-jez3l2o6l7oemsux
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.fix_bug_111664
timestamp: Sun 2007-05-06 03:47:14 +0200
message:
* blackbox/test_remove
- bzr rm bogus_file does not throw an exception any more.
* workingtree_implementations/test_remove
- Surround = with spaces for Alexander.
- Split out _assertRemoveErrorContainsRe which uses
assertContainsRe, to check if the error is as expected.
- Use assertRaises to check if the correct exceptions are thrown.
- Use build_tree_contents to change file contents.
- update test_remove_renamed_files doc string
- add test_remove_renamed_changed_files
- workingtree.remove( ['bogus_file'] does not throw an exception any more.
* workingtree.remove
- Fix minor typo in doctring, accidentally introduced by me recently.
- Rather use _iter_changes to detect changes as suggested by Aaron.
This is more flexible and more correct.
modified:
bzrlib/tests/blackbox/test_remove.py test_remove.py-20060530011439-fika5rm84lon0goe-1
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2475.5.1
revision-id: amanic at gmail.com-20070503071126-jez3l2o6l7oemsux
parent: pqm at pqm.ubuntu.com-20070501182714-71xp33bziogu3qu0
committer: Marius Kruger <amanic at gmail.com>
branch nick: bzr.rm_delete_working_file
timestamp: Thu 2007-05-03 09:11:26 +0200
message:
Fix bug and test: bzr rm refuses to delete renamed files
(Bug #111664)
modified:
bzrlib/tests/workingtree_implementations/test_remove.py test_remove.py-20070413183901-rvnp85rtc0q0sclp-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2599.1.9
revision-id: pqm at pqm.ubuntu.com-20070712114408-7iozx4b8hq8ts24n
parent: pqm at pqm.ubuntu.com-20070712104858-axdt2sml59kw4fjg
parent: mbp at sourcefrog.net-20070712094950-tvvsyf0rf2d2m86d
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-12 12:44:08 +0100
message:
(mbp,r=robert) doc testing of exceptions
modified:
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2513.1.9
revision-id: mbp at sourcefrog.net-20070712094950-tvvsyf0rf2d2m86d
parent: mbp at sourcefrog.net-20070712091115-uhg5zz3blan43m85
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-07-12 19:49:50 +1000
message:
Exception testing review comments
modified:
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2513.1.8
revision-id: mbp at sourcefrog.net-20070712091115-uhg5zz3blan43m85
parent: mbp at sourcefrog.net-20070626041504-sxdk4kjal60vnbxl
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2007-07-12 19:11:15 +1000
message:
Doc testing of exceptions
modified:
doc/configuration.txt configuration.txt-20060314161707-868350809502af01
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2599.1.8
revision-id: pqm at pqm.ubuntu.com-20070712104858-axdt2sml59kw4fjg
parent: pqm at pqm.ubuntu.com-20070712094937-rw5qbi81enh0pvhw
parent: mbp at sourcefrog.net-20070712085555-qfizepdt97bqubek
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-12 11:48:58 +0100
message:
Fix unbound variable in _create_prefix (thanks vila)
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2599.1.5.1.1
revision-id: mbp at sourcefrog.net-20070712085555-qfizepdt97bqubek
parent: pqm at pqm.ubuntu.com-20070712075207-pgz7ur4rxmklmrxr
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: trivial
timestamp: Thu 2007-07-12 18:55:55 +1000
message:
Fix unbound variable in _create_prefix (thanks vila)
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2599.1.7
revision-id: pqm at pqm.ubuntu.com-20070712094937-rw5qbi81enh0pvhw
parent: pqm at pqm.ubuntu.com-20070712085245-afvocysw990c1a3z
parent: aaron.bentley at utoronto.ca-20070712073944-f4fv0zzknqdcen7e
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-12 10:49:37 +0100
message:
Make most functions prefer NULL_REVISION
added:
bzrlib/tests/workingtree_implementations/test_uncommit.py test_uncommit.py-20070712063057-8zaprw7t7lcqxeje-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/branch_implementations/test_revision_id_to_revno.py test_revision_id_to_-20070417200738-lo776wkqikhe5goo-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2598.5.9
revision-id: aaron.bentley at utoronto.ca-20070712073944-f4fv0zzknqdcen7e
parent: aaron.bentley at utoronto.ca-20070712073718-255ekb0xllut6jmb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nullrevision
timestamp: Thu 2007-07-12 03:39:44 -0400
message:
Update NEWS and HACKING
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2598.5.8
revision-id: aaron.bentley at utoronto.ca-20070712073718-255ekb0xllut6jmb
parent: aaron.bentley at utoronto.ca-20070712072252-67b3yxu8650t6sgm
parent: pqm at pqm.ubuntu.com-20070712021235-0a3tqhdt9nxk0x9y
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nullrevision
timestamp: Thu 2007-07-12 03:37:18 -0400
message:
Merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
------------------------------------------------------------
revno: 2598.5.7
revision-id: aaron.bentley at utoronto.ca-20070712072252-67b3yxu8650t6sgm
parent: aaron.bentley at utoronto.ca-20070711221629-tbqh4m4mps264lxe
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nullrevision
timestamp: Thu 2007-07-12 03:22:52 -0400
message:
Updates from review
added:
bzrlib/tests/workingtree_implementations/test_uncommit.py test_uncommit.py-20070712063057-8zaprw7t7lcqxeje-1
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2598.5.6
revision-id: aaron.bentley at utoronto.ca-20070711221629-tbqh4m4mps264lxe
parent: abentley at panoramicfeedback.com-20070711190411-t6bscd8lfi27bstg
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: nullrevision
timestamp: Wed 2007-07-11 18:16:29 -0400
message:
Fix trailing whitespace
modified:
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
------------------------------------------------------------
revno: 2598.5.5
revision-id: abentley at panoramicfeedback.com-20070711190411-t6bscd8lfi27bstg
parent: abentley at panoramicfeedback.com-20070711194451-3jqhye1nnd02a9uv
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nullrevision
timestamp: Wed 2007-07-11 15:04:11 -0400
message:
Convert assertion to deprecation warning
modified:
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
------------------------------------------------------------
revno: 2598.5.4
revision-id: abentley at panoramicfeedback.com-20070711194451-3jqhye1nnd02a9uv
parent: abentley at panoramicfeedback.com-20070711164237-n1x38fz7fttybkqp
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nullrevision
timestamp: Wed 2007-07-11 15:44:51 -0400
message:
Restore original Branch.last_revision behavior, fix bits that care
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2598.5.3
revision-id: abentley at panoramicfeedback.com-20070711164237-n1x38fz7fttybkqp
parent: abentley at panoramicfeedback.com-20070711145854-06486yosdvexapy1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nullrevision
timestamp: Wed 2007-07-11 12:42:37 -0400
message:
Push NULL_REVISION deeper
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bundle/serializer/__init__.py __init__.py-20051118175413-86b97db0b618feef
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/tests/branch_implementations/test_revision_id_to_revno.py test_revision_id_to_-20070417200738-lo776wkqikhe5goo-1
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
bzrlib/tests/test_ancestry.py test_ancestry.py-20050913023709-69768e94848312c6
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2598.5.2
revision-id: abentley at panoramicfeedback.com-20070711145854-06486yosdvexapy1
parent: abentley at panoramicfeedback.com-20070710211854-93ofaa70day2p8d3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nullrevision
timestamp: Wed 2007-07-11 10:58:54 -0400
message:
Got all tests passing with Branch returning 'null:' for null revision
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
bzrlib/tests/branch_implementations/test_update.py test_update.py-20060305010612-e68efbcbb1baa69f
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml5.py xml5.py-20050907032657-aac8f960815b66b1
------------------------------------------------------------
revno: 2598.5.1
revision-id: abentley at panoramicfeedback.com-20070710211854-93ofaa70day2p8d3
parent: pqm at pqm.ubuntu.com-20070710021221-8o98e4q8vcpaarnk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: nullrevision
timestamp: Tue 2007-07-10 17:18:54 -0400
message:
Start eliminating the use of None to indicate null revision
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/memorytree.py memorytree.py-20060906023413-4wlkalbdpsxi2r4y-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-1
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 2599.1.6
revision-id: pqm at pqm.ubuntu.com-20070712085245-afvocysw990c1a3z
parent: pqm at pqm.ubuntu.com-20070712075207-pgz7ur4rxmklmrxr
parent: mbp at sourcefrog.net-20070711063329-3q9rz8bljj2iisi1
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-12 09:52:45 +0100
message:
cleanup global options, and require options to provide a help string
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
------------------------------------------------------------
revno: 2598.1.12
revision-id: mbp at sourcefrog.net-20070711063329-3q9rz8bljj2iisi1
parent: mbp at sourcefrog.net-20070711051842-rt9uj743zir4ixhn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: check-options
timestamp: Wed 2007-07-11 16:33:29 +1000
message:
Fix up --kind options
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2598.1.11
revision-id: mbp at sourcefrog.net-20070711051842-rt9uj743zir4ixhn
parent: mbp at sourcefrog.net-20070711050413-hrgdcuhrujn974gc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: check-options
timestamp: Wed 2007-07-11 15:18:42 +1000
message:
Insist that all options have a help string and fix those that don't.
(Thanks John)
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
------------------------------------------------------------
revno: 2598.1.10
revision-id: mbp at sourcefrog.net-20070711050413-hrgdcuhrujn974gc
parent: mbp at sourcefrog.net-20070711041852-u0owtlcd1rh9ri37
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: check-options
timestamp: Wed 2007-07-11 15:04:13 +1000
message:
Clean up options that are registered globally and used once or not at all.
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
------------------------------------------------------------
revno: 2598.1.9
revision-id: mbp at sourcefrog.net-20070711041852-u0owtlcd1rh9ri37
parent: mbp at sourcefrog.net-20070711041548-n1om2ptyj2j01r6l
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: check-options
timestamp: Wed 2007-07-11 14:18:52 +1000
message:
Add failing test that global options are used at least twice
modified:
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
------------------------------------------------------------
revno: 2598.1.8
revision-id: mbp at sourcefrog.net-20070711041548-n1om2ptyj2j01r6l
parent: mbp at sourcefrog.net-20070711034822-w0c7cnxnuo7naay5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: check-options
timestamp: Wed 2007-07-11 14:15:48 +1000
message:
Clean up old/unused global options
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
------------------------------------------------------------
revno: 2598.1.7
revision-id: mbp at sourcefrog.net-20070711034822-w0c7cnxnuo7naay5
parent: mbp at sourcefrog.net-20070711034634-44v65lrdqsdh9k2s
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: check-options
timestamp: Wed 2007-07-11 13:48:22 +1000
message:
Add failing test that global options are all used.
modified:
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
------------------------------------------------------------
revno: 2598.1.6
revision-id: mbp at sourcefrog.net-20070711034634-44v65lrdqsdh9k2s
parent: mbp at sourcefrog.net-20070711032003-9t03vnewhh4fg6qw
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: check-options
timestamp: Wed 2007-07-11 13:46:34 +1000
message:
Add help for --no-backup
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 2599.1.5
revision-id: pqm at pqm.ubuntu.com-20070712075207-pgz7ur4rxmklmrxr
parent: pqm at pqm.ubuntu.com-20070712021235-0a3tqhdt9nxk0x9y
parent: mbp at sourcefrog.net-20070712035539-dl43w69md9ni92m3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-12 08:52:07 +0100
message:
(mbp,r=aaron) remove obsolete selftest options
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 2598.4.2
revision-id: mbp at sourcefrog.net-20070712035539-dl43w69md9ni92m3
parent: mbp at sourcefrog.net-20070711014446-up0nkhg2u8nvupyl
parent: pqm at pqm.ubuntu.com-20070712021235-0a3tqhdt9nxk0x9y
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Thu 2007-07-12 13:55:39 +1000
message:
Merge trunk
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/commands.py __init__.py-20050617152058-1b6530d9ab85c11c
bzrlib/cmd_version_info.py __init__.py-20051228204928-697d01fdca29c99b
bzrlib/conflicts.py conflicts.py-20051001061850-78ef952ba63d2b42
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/sign_my_commits.py sign_my_commits.py-20060215152201-5a6363365180e671
bzrlib/tests/blackbox/test_help.py test_help.py-20060216004358-4ee8a2a338f75a62
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/test_help.py test_help.py-20070419045354-6q6rq15j9e2n5fna-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING HACKING-20050805200004-2a5dc975d870f78c
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
------------------------------------------------------------
revno: 2598.4.1
revision-id: mbp at sourcefrog.net-20070711014446-up0nkhg2u8nvupyl
parent: pqm at pqm.ubuntu.com-20070710021221-8o98e4q8vcpaarnk
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: test-cleanup
timestamp: Wed 2007-07-11 11:44:46 +1000
message:
Remove obsolete --clean-output, --keep-output, --numbered-dirs selftest options (thanks Alexander)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_selftest.py test_selftest.py-20060123024542-01c5f1bbcb596d78
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 2599.1.4
revision-id: pqm at pqm.ubuntu.com-20070712021235-0a3tqhdt9nxk0x9y
parent: pqm at pqm.ubuntu.com-20070711221443-ntcgqkwy42mislml
parent: abentley at panoramicfeedback.com-20070710181401-lfw19orwavwyk603
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-07-12 03:12:35 +0100
message:
Merge uses Tree._iter_changes (Aaron Bentley)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
------------------------------------------------------------
revno: 2590.2.10
revision-id: abentley at panoramicfeedback.com-20070710181401-lfw19orwavwyk603
parent: abentley at panoramicfeedback.com-20070710175519-qfdqkmx0zankbgfo
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: changes-merge
timestamp: Tue 2007-07-10 14:14:01 -0400
message:
Updates from review
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
------------------------------------------------------------
revno: 2590.2.9
revision-id: abentley at panoramicfeedback.com-20070710175519-qfdqkmx0zankbgfo
parent: abentley at panoramicfeedback.com-20070706172134-kz3k30d2pu61qngi
parent: pqm at pqm.ubuntu.com-20070710021221-8o98e4q8vcpaarnk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: changes-merge
timestamp: Tue 2007-07-10 13:55:19 -0400
message:
Merge from bzr.dev
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/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/blackbox/test_commit.py test_commit.py-20060212094538-ae88fc861d969db0
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
doc/developers/scratch.txt scratch.txt-20070618020404-cdhv0ecgrukomemg-3
------------------------------------------------------------
revno: 2590.2.8
revision-id: abentley at panoramicfeedback.com-20070706172134-kz3k30d2pu61qngi
parent: aaron.bentley at utoronto.ca-20070706013111-gykms7zh122pm0z8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: changes-merge
timestamp: Fri 2007-07-06 13:21:34 -0400
message:
Restore conflict handling changes
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 2590.2.7
revision-id: aaron.bentley at utoronto.ca-20070706013111-gykms7zh122pm0z8
parent: aaron.bentley at utoronto.ca-20070706005922-7j1b5ed8spn9ml7d
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: changes-merge
timestamp: Thu 2007-07-05 21:31:11 -0400
message:
Misc cleanup
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
------------------------------------------------------------
revno: 2590.2.6
revision-id: aaron.bentley at utoronto.ca-20070706005922-7j1b5ed8spn9ml7d
parent: aaron.bentley at utoronto.ca-20070706005858-covn9uur45ir2mz9
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: changes-merge
timestamp: Thu 2007-07-05 20:59:22 -0400
message:
Update docs to note that iter_changes-merge is done
modified:
doc/developers/performance.dot performance.dot-20070527173558-rqaqxn1al7vzgcto-3
------------------------------------------------------------
revno: 2590.2.5
revision-id: aaron.bentley at utoronto.ca-20070706005858-covn9uur45ir2mz9
parent: abentley at panoramicfeedback.com-20070705161911-35s2ct3lnb8mx3wq
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: changes-merge
timestamp: Thu 2007-07-05 20:58:58 -0400
message:
Allow selected files to be specified instead of selected ids
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/test_merge_core.py test_merge_core.py-20050824132511-eb99b23a0eec641b
------------------------------------------------------------
revno: 2590.2.4
revision-id: abentley at panoramicfeedback.com-20070705161911-35s2ct3lnb8mx3wq
parent: abentley at panoramicfeedback.com-20070705153934-ap3nxs9fa9u8yvfr
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: changes-merge
timestamp: Thu 2007-07-05 12:19:11 -0400
message:
Move entry generation to a helper
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
------------------------------------------------------------
revno: 2590.2.3
revision-id: abentley at panoramicfeedback.com-20070705153934-ap3nxs9fa9u8yvfr
parent: abentley at panoramicfeedback.com-20070705151112-207czq9spmtd485e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: changes-merge
timestamp: Thu 2007-07-05 11:39:34 -0400
message:
Merge the execute bit based on iter_changes
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
------------------------------------------------------------
revno: 2590.2.2
revision-id: abentley at panoramicfeedback.com-20070705151112-207czq9spmtd485e
parent: abentley at panoramicfeedback.com-20070705144545-fnl4i5s4vdi8wyh0
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: changes-merge
timestamp: Thu 2007-07-05 11:11:12 -0400
message:
Do most name merging from iter_changes output
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
------------------------------------------------------------
revno: 2590.2.1
revision-id: abentley at panoramicfeedback.com-20070705144545-fnl4i5s4vdi8wyh0
parent: pqm at pqm.ubuntu.com-20070705054119-z89j99ne0vvywkgu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: changes-merge
timestamp: Thu 2007-07-05 10:45:45 -0400
message:
Start work on merging names based on iter_changes
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
------------------------------------------------------------
revno: 2599.1.3
revision-id: pqm at pqm.ubuntu.com-20070711221443-ntcgqkwy42mislml
parent: pqm at pqm.ubuntu.com-20070711162842-8fx9cc0c3ogyxudl
parent: kuno.meyer at gmx.ch-20070710200445-ckfv00qm9fampvro
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-07-11 23:14:43 +0100
message:
(Kuno Meyer) Fix glob_expand_for_win32
modified:
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 2598.3.1
revision-id: kuno.meyer at gmx.ch-20070710200445-ckfv00qm9fampvro
parent: pqm at pqm.ubuntu.com-20070710021221-8o98e4q8vcpaarnk
committer: Kuno Meyer <kuno.meyer at gmx.ch>
branch nick: rprot
timestamp: Tue 2007-07-10 22:04:45 +0200
message:
fix method rename glob_expand_for_win32 -> win32utils.glob_expand
modified:
bzrlib/win32utils.py win32console.py-20051021033308-123c6c929d04973d
------------------------------------------------------------
revno: 2599.1.2
revision-id: pqm at pqm.ubuntu.com-20070711162842-8fx9cc0c3ogyxudl
parent: pqm at pqm.ubuntu.com-20070711055149-s5wsfnc1jatpoi1x
parent: john at arbash-meinel.com-20070710200733-ihnfsn13afibbs6w
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-07-11 17:28:42 +0100
message:
(John Arbash Meinel) Simple fix to avoid a .split('/') when we don't need it
modified:
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 2598.2.1
revision-id: john at arbash-meinel.com-20070710200733-ihnfsn13afibbs6w
parent: pqm at pqm.ubuntu.com-20070710021221-8o98e4q8vcpaarnk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: simple_no_split
timestamp: Tue 2007-07-10 15:07:33 -0500
message:
Update WT4._iter_changes to not split the basename, since it will
never contain a '/' character.
modified:
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 2599.1.1
revision-id: pqm at pqm.ubuntu.com-20070711055149-s5wsfnc1jatpoi1x
parent: pqm at pqm.ubuntu.com-20070711041950-ci5yz9nyhbcdmuqv
parent: aaron.bentley at utoronto.ca-20070711045443-oi9vk0jgepts5k5s
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-07-11 06:51:49 +0100
message:
nicer path display in info command
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.44
revision-id: aaron.bentley at utoronto.ca-20070711045443-oi9vk0jgepts5k5s
parent: abentley at panoramicfeedback.com-20070706212010-yesdnjys9484lftu
parent: pqm at pqm.ubuntu.com-20070710021221-8o98e4q8vcpaarnk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-07-11 00:54:43 -0400
message:
Merge bzr.dev
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/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/test_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
doc/developers/scratch.txt scratch.txt-20070618020404-cdhv0ecgrukomemg-3
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.43
revision-id: abentley at panoramicfeedback.com-20070706212010-yesdnjys9484lftu
parent: abentley at panoramicfeedback.com-20070706184146-e3rxswzbfslos4mi
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-07-06 17:20:10 -0400
message:
Provide ways of getting at unicode-clean output
modified:
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.42
revision-id: abentley at panoramicfeedback.com-20070706184146-e3rxswzbfslos4mi
parent: abentley at panoramicfeedback.com-20070706183050-2folzf1brc3syc3a
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-07-06 14:41:46 -0400
message:
Add NEWS entry
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.41
revision-id: abentley at panoramicfeedback.com-20070706183050-2folzf1brc3syc3a
parent: abentley at panoramicfeedback.com-20070706163615-wxdeft13etu780bk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-07-06 14:30:50 -0400
message:
Make info provide more related brances, and format all branches nicely
modified:
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.40
revision-id: abentley at panoramicfeedback.com-20070706163615-wxdeft13etu780bk
parent: aaron.bentley at utoronto.ca-20070705101146-on81r29qia562yfe
parent: pqm at pqm.ubuntu.com-20070706141845-sije5bdx8pjw2fhk
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2007-07-06 12:36:15 -0400
message:
Merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/info.py info.py-20050323235939-6bbfe7d9700b0b9b
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/decorator.py decorator.py-20060402223305-e913a0f25319ab42
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
Diff too large for email (3930 lines, the limit is 1000).
More information about the bazaar-commits
mailing list