Rev 2510: Some small improvements to the pack format, and also merge in bzr.dev. in http://bazaar.launchpad.net/~bzr/bzr/container-format
Andrew Bennetts
andrew.bennetts at canonical.com
Thu Jun 14 03:04:11 BST 2007
At http://bazaar.launchpad.net/~bzr/bzr/container-format
------------------------------------------------------------
revno: 2510
revision-id: andrew.bennetts at canonical.com-20070614015707-hncvkzg0mn4w0w31
parent: andrew.bennetts at canonical.com-20070612015639-z378i21fmcnd5j4x
parent: andrew.bennetts at canonical.com-20070613105602-1bagfibob1rh21mg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Thu 2007-06-14 11:57:07 +1000
message:
Some small improvements to the pack format, and also merge in bzr.dev.
added:
bzrlib/tests/branch_implementations/test_sprout.py test_sprout.py-20070521151739-b8t8p7axw1h966ws-1
bzrlib/tests/test_lsprof.py test_lsprof.py-20070606095601-bctdndm8yhc0cqnc-1
doc/developers/container-format.txt containerformat.txt-20070601074309-7n7w1jiyayud6xdn-1
doc/developers/performance-commit.txt performancecommit.tx-20070606061633-4y4rawskx5ejb99w-1
doc/developers/planned-performance-changes.txt plannedperformancech-20070604053752-bnjdhako613xfufb-1
doc/developers/profiling.txt profiling.txt-20070531045713-j15mxufywgzwdeu8-1
renamed:
doc/developers/bundle-creation.rst => doc/developers/bundle-creation.txt bundlecreation.rst-20070527173558-rqaqxn1al7vzgcto-1
doc/developers/initial-push-pull.rst => doc/developers/initial-push-pull.txt initialpushpull.rst-20070527184539-wodba32mi5dehhct-1
doc/developers/merge-scaling.rst => doc/developers/merge-scaling.txt mergescaling.rst-20070527173558-rqaqxn1al7vzgcto-2
modified:
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/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/help_topics.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/lsprof.py lsprof.py-20051208071030-833790916798ceed
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/pack.py container.py-20070607160755-tr8zc26q18rn0jnb-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_revision_info.py test_revision_info.py-20050917162600-21dab3877aa348d7
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_lockdir.py test_lockdir.py-20060220222025-33d4221569a3d600
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_pack.py test_container.py-20070607160755-tr8zc26q18rn0jnb-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
contrib/bash/bzr.simple bzr-20050503074841-dfc41af1e02111f9
doc/developers/add.txt add.txt-20070515094933-xhgz3xjc7o0edok0-2
doc/developers/annotate.txt annotate.txt-20070515142136-rq51c4kqhwrjsh8k-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/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/revert.txt revert.txt-20070515111013-grc9hgp21zxqbwbl-1
doc/tutorial.txt tutorial.txt-20050804190939-9dcbba2ef053bc84
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
doc/developers/bundle-creation.txt bundlecreation.rst-20070527173558-rqaqxn1al7vzgcto-1
doc/developers/initial-push-pull.txt initialpushpull.rst-20070527184539-wodba32mi5dehhct-1
doc/developers/merge-scaling.txt mergescaling.rst-20070527173558-rqaqxn1al7vzgcto-2
------------------------------------------------------------
revno: 2509.1.4
revision-id: andrew.bennetts at canonical.com-20070613105602-1bagfibob1rh21mg
parent: andrew.bennetts at canonical.com-20070613105446-ukb9knp9dmy57v74
parent: pqm at pqm.ubuntu.com-20070613061627-xx5xk6q0oxcy1etm
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Wed 2007-06-13 20:56:02 +1000
message:
Merge from bzr.dev.
------------------------------------------------------------
revno: 2506.1.21
revision-id: pqm at pqm.ubuntu.com-20070613061627-xx5xk6q0oxcy1etm
parent: pqm at pqm.ubuntu.com-20070613035912-pvm3sni5chbome9j
parent: aaron.bentley at utoronto.ca-20070613054325-3sma3rfutgyj9ktm
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-13 07:16:27 +0100
message:
make profiling information easier to view and better documented (Clatworthy)
------------------------------------------------------------
revno: 2493.2.11
revision-id: aaron.bentley at utoronto.ca-20070613054325-3sma3rfutgyj9ktm
parent: abentley at panoramicfeedback.com-20070612181006-kinkxenc2dmgb4lp
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.kcachegrind
timestamp: Wed 2007-06-13 01:43:25 -0400
message:
Compensate for brittle requireFeature behavior
------------------------------------------------------------
revno: 2493.2.10
revision-id: abentley at panoramicfeedback.com-20070612181006-kinkxenc2dmgb4lp
parent: abentley at panoramicfeedback.com-20070612145707-6ul10rmeln23my4f
parent: pqm at pqm.ubuntu.com-20070612172839-mr0bjmyfguskc0tg
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.kcachegrind
timestamp: Tue 2007-06-12 14:10:06 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2493.2.9
revision-id: abentley at panoramicfeedback.com-20070612145707-6ul10rmeln23my4f
parent: abentley at panoramicfeedback.com-20070612145111-yuwn0kkaj0j2csar
parent: pqm at pqm.ubuntu.com-20070612060727-v8nd5etbkay15fm2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.kcachegrind
timestamp: Tue 2007-06-12 10:57:07 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2493.2.8
revision-id: abentley at panoramicfeedback.com-20070612145111-yuwn0kkaj0j2csar
parent: abentley at panoramicfeedback.com-20070612144646-li182vnwwb2utpjx
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.kcachegrind
timestamp: Tue 2007-06-12 10:51:11 -0400
message:
Convert old lsprof tests to require new LSProf Feature instead of skipping
------------------------------------------------------------
revno: 2493.2.7
revision-id: abentley at panoramicfeedback.com-20070612144646-li182vnwwb2utpjx
parent: abentley at panoramicfeedback.com-20070612141350-nk6niovgz6ne2vit
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.kcachegrind
timestamp: Tue 2007-06-12 10:46:46 -0400
message:
Add info to --lsprof-file entry in global options
------------------------------------------------------------
revno: 2493.2.6
revision-id: abentley at panoramicfeedback.com-20070612141350-nk6niovgz6ne2vit
parent: ian.clatworthy at internode.on.net-20070606115137-iq6sk13d8p356bo8
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.kcachegrind
timestamp: Tue 2007-06-12 10:13:50 -0400
message:
Make LSProf into a Feature required by the appropriate tests
------------------------------------------------------------
revno: 2493.2.5
revision-id: ian.clatworthy at internode.on.net-20070606115137-iq6sk13d8p356bo8
parent: ian.clatworthy at internode.on.net-20070606110604-ou544q3egg7tko88
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.kcachegrind
timestamp: Wed 2007-06-06 21:51:37 +1000
message:
explicit format saving test
------------------------------------------------------------
revno: 2493.2.4
revision-id: ian.clatworthy at internode.on.net-20070606110604-ou544q3egg7tko88
parent: ian.clatworthy at internode.on.net-20070606104508-q2i41r4r23xkaebs
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.kcachegrind
timestamp: Wed 2007-06-06 21:06:04 +1000
message:
removed old profiling data saving code from UI layer
------------------------------------------------------------
revno: 2493.2.3
revision-id: ian.clatworthy at internode.on.net-20070606104508-q2i41r4r23xkaebs
parent: ian.clatworthy at internode.on.net-20070531045925-jdx7px85ktqxxzox
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.kcachegrind
timestamp: Wed 2007-06-06 20:45:08 +1000
message:
changes requested in jameinel's review incorporated
------------------------------------------------------------
revno: 2493.2.2
revision-id: ian.clatworthy at internode.on.net-20070531045925-jdx7px85ktqxxzox
parent: ian.clatworthy at internode.on.net-20070528020825-ytop085jnocvmx3q
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.kcachegrind
timestamp: Thu 2007-05-31 14:59:25 +1000
message:
Incorporate feedback from Robert Collins
------------------------------------------------------------
revno: 2493.2.1
revision-id: ian.clatworthy at internode.on.net-20070528020825-ytop085jnocvmx3q
parent: pqm at pqm.ubuntu.com-20070524165738-rzs9lvgoqk20vls9
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.kcachegrind
timestamp: Mon 2007-05-28 12:08:25 +1000
message:
make profiling information easier to view and better documented
------------------------------------------------------------
revno: 2506.1.20
revision-id: pqm at pqm.ubuntu.com-20070613035912-pvm3sni5chbome9j
parent: pqm at pqm.ubuntu.com-20070612172839-mr0bjmyfguskc0tg
parent: aaron.bentley at utoronto.ca-20070613030239-yrkk8z0m5me87fpp
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-13 04:59:12 +0100
message:
Submitting empty commit
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.23
revision-id: aaron.bentley at utoronto.ca-20070613030239-yrkk8z0m5me87fpp
parent: abentley at panoramicfeedback.com-20070612162423-vm2vm5kzla75m4a9
parent: pqm at pqm.ubuntu.com-20070612172839-mr0bjmyfguskc0tg
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-12 23:02:39 -0400
message:
Empty commit
------------------------------------------------------------
revno: 2506.1.19
revision-id: pqm at pqm.ubuntu.com-20070612172839-mr0bjmyfguskc0tg
parent: pqm at pqm.ubuntu.com-20070612155157-j1juioefu5w946ph
parent: abentley at panoramicfeedback.com-20070612162423-vm2vm5kzla75m4a9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-12 18:28:39 +0100
message:
Fix botched merge
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.22
revision-id: abentley at panoramicfeedback.com-20070612162423-vm2vm5kzla75m4a9
parent: abentley at panoramicfeedback.com-20070612162245-uotkgkgozzf5bp9w
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-12 12:24:23 -0400
message:
Redo test skip
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.21
revision-id: abentley at panoramicfeedback.com-20070612162245-uotkgkgozzf5bp9w
parent: abentley at panoramicfeedback.com-20070612145249-1izjczqhnfp71s9k
parent: abentley at panoramicfeedback.com-20070612162140-vea2zg1sbw6kckic
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-12 12:22:45 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2506.1.18.1.1
revision-id: abentley at panoramicfeedback.com-20070612162140-vea2zg1sbw6kckic
parent: pqm at pqm.ubuntu.com-20070612155157-j1juioefu5w946ph
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.dev
timestamp: Tue 2007-06-12 12:21:40 -0400
message:
Revert broken changes
------------------------------------------------------------
revno: 2506.1.18
revision-id: pqm at pqm.ubuntu.com-20070612155157-j1juioefu5w946ph
parent: pqm at pqm.ubuntu.com-20070612060727-v8nd5etbkay15fm2
parent: abentley at panoramicfeedback.com-20070612145249-1izjczqhnfp71s9k
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-12 16:51:57 +0100
message:
Skip intermittently failing test
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.20
revision-id: abentley at panoramicfeedback.com-20070612145249-1izjczqhnfp71s9k
parent: abentley at panoramicfeedback.com-20070612134001-7flc9ah94fjd1c0i
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-12 10:52:49 -0400
message:
Fix skip
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.19
revision-id: abentley at panoramicfeedback.com-20070612134001-7flc9ah94fjd1c0i
parent: abentley at panoramicfeedback.com-20070607153137-4z29jxet3cgdtokg
parent: pqm at pqm.ubuntu.com-20070612060727-v8nd5etbkay15fm2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-12 09:40:01 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.18
revision-id: abentley at panoramicfeedback.com-20070607153137-4z29jxet3cgdtokg
parent: abentley at panoramicfeedback.com-20070605164300-h5psuzw7j8px7zua
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2007-06-07 11:31:37 -0400
message:
Skip itermittently-failing test instead of deleting it
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.17
revision-id: abentley at panoramicfeedback.com-20070605164300-h5psuzw7j8px7zua
parent: abentley at panoramicfeedback.com-20070604185921-xbnqxwypl1junwy3
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-05 12:43:00 -0400
message:
Remove broken test
------------------------------------------------------------
revno: 2506.1.17
revision-id: pqm at pqm.ubuntu.com-20070612060727-v8nd5etbkay15fm2
parent: pqm at pqm.ubuntu.com-20070612021742-uetsy3g747iq3xkk
parent: ian.clatworthy at internode.on.net-20070612043421-jysoks4ytany6l45
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-12 07:07:27 +0100
message:
prepare for 0.18 development
------------------------------------------------------------
revno: 2506.1.16.1.1
revision-id: ian.clatworthy at internode.on.net-20070612043421-jysoks4ytany6l45
parent: pqm at pqm.ubuntu.com-20070612021742-uetsy3g747iq3xkk
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.dev
timestamp: Tue 2007-06-12 14:34:21 +1000
message:
prepare for 0.18 development
------------------------------------------------------------
revno: 2506.1.16
revision-id: pqm at pqm.ubuntu.com-20070612021742-uetsy3g747iq3xkk
parent: pqm at pqm.ubuntu.com-20070612000924-if8v5wnnp3nwmghg
parent: mbp at sourcefrog.net-20070612014420-kie1j69sqjn8cig0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-12 03:17:42 +0100
message:
merge init --create-prefix
------------------------------------------------------------
revno: 2506.1.15.1.1
revision-id: mbp at sourcefrog.net-20070612014420-kie1j69sqjn8cig0
parent: pqm at pqm.ubuntu.com-20070612000924-if8v5wnnp3nwmghg
parent: d.m.watkins at warwick.ac.uk-20070603214150-uqxz0emixszcj6cz
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 56322
timestamp: Tue 2007-06-12 11:44:20 +1000
message:
merge init --create-prefix
------------------------------------------------------------
revno: 2504.1.4
revision-id: d.m.watkins at warwick.ac.uk-20070603214150-uqxz0emixszcj6cz
parent: d.m.watkins at warwick.ac.uk-20070603214016-y449vw1v37bv6oxt
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 56322
timestamp: Sun 2007-06-03 22:41:50 +0100
message:
Removed TODO relating to create-prefix.
------------------------------------------------------------
revno: 2504.1.3
revision-id: d.m.watkins at warwick.ac.uk-20070603214016-y449vw1v37bv6oxt
parent: d.m.watkins at warwick.ac.uk-20070603213950-3e81fuyuxpb9abcc
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 56322
timestamp: Sun 2007-06-03 22:40:16 +0100
message:
Implemented --create-prefix for 'init'.
------------------------------------------------------------
revno: 2504.1.2
revision-id: d.m.watkins at warwick.ac.uk-20070603213950-3e81fuyuxpb9abcc
parent: d.m.watkins at warwick.ac.uk-20070603204524-no0cjahivzp0txv4
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 56322
timestamp: Sun 2007-06-03 22:39:50 +0100
message:
Created tests for adding --create-prefix to 'init'.
------------------------------------------------------------
revno: 2504.1.1
revision-id: d.m.watkins at warwick.ac.uk-20070603204524-no0cjahivzp0txv4
parent: pqm at pqm.ubuntu.com-20070602184854-kwqaduxs0b19r76n
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 56322
timestamp: Sun 2007-06-03 21:45:24 +0100
message:
Abstracted create_prefix code from the class 'cmd_push' to the function '_create_prefix' (both in builtins.py).
------------------------------------------------------------
revno: 2506.1.15
revision-id: pqm at pqm.ubuntu.com-20070612000924-if8v5wnnp3nwmghg
parent: pqm at pqm.ubuntu.com-20070608134340-flu6dlpzyo7izrrs
parent: john at arbash-meinel.com-20070611232340-paq4xaycao04vkcd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-12 01:09:24 +0100
message:
(John Arbash Meinel, Aaron Bentley) Fix bug #115343 allowing 'bzr branch' to sprout any revision in the repository.
------------------------------------------------------------
revno: 2487.2.7
revision-id: john at arbash-meinel.com-20070611232340-paq4xaycao04vkcd
parent: aaron.bentley at utoronto.ca-20070611010812-u55krk2l4pnv86fs
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-06-11 18:23:40 -0500
message:
Fix NEWS to put _iter_changes fixes in right location.
------------------------------------------------------------
revno: 2487.2.6
revision-id: aaron.bentley at utoronto.ca-20070611010812-u55krk2l4pnv86fs
parent: aaron.bentley at utoronto.ca-20070611010616-23ypxhz3zekrck7y
parent: pqm at pqm.ubuntu.com-20070608134340-flu6dlpzyo7izrrs
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fix-115343
timestamp: Sun 2007-06-10 21:08:12 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2487.2.5
revision-id: aaron.bentley at utoronto.ca-20070611010616-23ypxhz3zekrck7y
parent: aaron.bentley at utoronto.ca-20070611010119-8aayeoi2l6d0si36
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fix-115343
timestamp: Sun 2007-06-10 21:06:16 -0400
message:
Tweak NEWS
------------------------------------------------------------
revno: 2487.2.4
revision-id: aaron.bentley at utoronto.ca-20070611010119-8aayeoi2l6d0si36
parent: john at arbash-meinel.com-20070521170258-206ck4nmijfode31
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fix-115343
timestamp: Sun 2007-06-10 21:01:19 -0400
message:
Add test to ensure we can branch from repository revisions
------------------------------------------------------------
revno: 2487.2.3
revision-id: john at arbash-meinel.com-20070521170258-206ck4nmijfode31
parent: john at arbash-meinel.com-20070521164413-tp0zcdi51i5dxkv2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_from_merged_115343
timestamp: Mon 2007-05-21 19:02:58 +0200
message:
Fix bug #115343, Add a test that we can branch any revision in our ancestry.
And update Branch6 to support this properly.
------------------------------------------------------------
revno: 2487.2.2
revision-id: john at arbash-meinel.com-20070521164413-tp0zcdi51i5dxkv2
parent: john at arbash-meinel.com-20070521151804-dgnr0rfe2j9brq1m
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_from_merged_115343
timestamp: Mon 2007-05-21 18:44:13 +0200
message:
Adding a simple sprout test to make sure it creates the target branch with the right format
------------------------------------------------------------
revno: 2487.2.1
revision-id: john at arbash-meinel.com-20070521151804-dgnr0rfe2j9brq1m
parent: pqm at pqm.ubuntu.com-20070517174205-qwgn733pkui2xqr4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: branch_from_merged_115343
timestamp: Mon 2007-05-21 17:18:04 +0200
message:
Move the Branch.sprout tests into their own folder.
------------------------------------------------------------
revno: 2506.1.14
revision-id: pqm at pqm.ubuntu.com-20070608134340-flu6dlpzyo7izrrs
parent: pqm at pqm.ubuntu.com-20070608032544-x774g5cn0yh8a42p
parent: ian.clatworthy at internode.on.net-20070606140614-yp66v5i1gm5kruqp
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-08 14:43:40 +0100
message:
(Ian Clatworthy, r=john) 'branch lp:projname' now creates ./projname as expected
------------------------------------------------------------
revno: 2506.1.6.4.1
revision-id: ian.clatworthy at internode.on.net-20070606140614-yp66v5i1gm5kruqp
parent: pqm at pqm.ubuntu.com-20070606083714-rt2za45t9gt5nqqh
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.branch-lp-ui
timestamp: Thu 2007-06-07 00:06:14 +1000
message:
Fixes #115491 - 'branch lp:projname' now creates ./projname as exected
------------------------------------------------------------
revno: 2506.1.13
revision-id: pqm at pqm.ubuntu.com-20070608032544-x774g5cn0yh8a42p
parent: pqm at pqm.ubuntu.com-20070607233523-rrkkcg7n2ks0zi18
parent: andrew.bennetts at canonical.com-20070608024719-g3ewkke9l20ts0g9
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-08 04:25:44 +0100
message:
(Andrew Bennetts) Developer documentation for the propsed container format.
------------------------------------------------------------
revno: 2499.4.4
revision-id: andrew.bennetts at canonical.com-20070608024719-g3ewkke9l20ts0g9
parent: andrew.bennetts at canonical.com-20070607064153-z6sap26og3pbxxrl
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format-doc
timestamp: Fri 2007-06-08 12:47:19 +1000
message:
Typos and clarfications thanks to Aaron.
------------------------------------------------------------
revno: 2499.4.3
revision-id: andrew.bennetts at canonical.com-20070607064153-z6sap26og3pbxxrl
parent: andrew.bennetts at canonical.com-20070607040810-7aeblrfw0sl41mun
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format-doc
timestamp: Thu 2007-06-07 16:41:53 +1000
message:
Updates in response to feedback on mailing list and in person.
------------------------------------------------------------
revno: 2499.4.2
revision-id: andrew.bennetts at canonical.com-20070607040810-7aeblrfw0sl41mun
parent: andrew.bennetts at canonical.com-20070601074703-5z2fps5c8c7c6bjp
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format-doc
timestamp: Thu 2007-06-07 14:08:10 +1000
message:
Use standard heading markers.
------------------------------------------------------------
revno: 2499.4.1
revision-id: andrew.bennetts at canonical.com-20070601074703-5z2fps5c8c7c6bjp
parent: pqm at pqm.ubuntu.com-20070531210833-8ptk86ocu822hjd5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format-doc
timestamp: Fri 2007-06-01 17:47:03 +1000
message:
First draft of container format developer doc, based on discussion with Robert.
------------------------------------------------------------
revno: 2506.1.12
revision-id: pqm at pqm.ubuntu.com-20070607233523-rrkkcg7n2ks0zi18
parent: pqm at pqm.ubuntu.com-20070607135016-0u2o57cfwa9ts265
parent: john at arbash-meinel.com-20070607223144-u4oljlajcvq6by2n
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-06-08 00:35:23 +0100
message:
(John Arbash Meinel) Fix bug #115947, set_state_from_inventory needs to watch out for certain paths.
------------------------------------------------------------
revno: 2487.1.3
revision-id: john at arbash-meinel.com-20070607223144-u4oljlajcvq6by2n
parent: john at arbash-meinel.com-20070521113638-3gnfdxspxklyv8bb
parent: pqm at pqm.ubuntu.com-20070607135016-0u2o57cfwa9ts265
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_set_state_from_inv_115947
timestamp: Thu 2007-06-07 17:31:44 -0500
message:
[merge] bzr.dev 2517
------------------------------------------------------------
revno: 2487.1.2
revision-id: john at arbash-meinel.com-20070521113638-3gnfdxspxklyv8bb
parent: john at arbash-meinel.com-20070521112814-156v4tp2oyya2oqb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_set_state_from_inv_115947
timestamp: Mon 2007-05-21 13:36:38 +0200
message:
Fix bug #115947, DirState.set_state_from_inventory() needs to iterate in
the correct order when there are common prefixes.
------------------------------------------------------------
revno: 2487.1.1
revision-id: john at arbash-meinel.com-20070521112814-156v4tp2oyya2oqb
parent: pqm at pqm.ubuntu.com-20070517174205-qwgn733pkui2xqr4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_set_state_from_inv_115947
timestamp: Mon 2007-05-21 13:28:14 +0200
message:
Adding a (broken) test that set_state_from_inventory works
when a record is deleted from a directory which has a sibling directory with a common prefix.
------------------------------------------------------------
revno: 2506.1.11
revision-id: pqm at pqm.ubuntu.com-20070607135016-0u2o57cfwa9ts265
parent: pqm at pqm.ubuntu.com-20070607132155-dn02612f4o14a1no
parent: abentley at panoramicfeedback.com-20070607125547-hm8sfjmq69p1e8s8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-07 14:50:16 +0100
message:
Update tutorial text (Matthew Fuller)
------------------------------------------------------------
revno: 2495.2.5
revision-id: abentley at panoramicfeedback.com-20070607125547-hm8sfjmq69p1e8s8
parent: abentley at panoramicfeedback.com-20070607125251-hd7pueyh1exfvu4b
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.docs
timestamp: Thu 2007-06-07 08:55:47 -0400
message:
Zap trailing whitespace
------------------------------------------------------------
revno: 2495.2.4
revision-id: abentley at panoramicfeedback.com-20070607125251-hd7pueyh1exfvu4b
parent: abentley at panoramicfeedback.com-20070607125207-8ss1ncu3m88fgfqm
parent: fullermd at over-yonder.net-20070606095255-zogzpvrnhh5su387
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.docs
timestamp: Thu 2007-06-07 08:52:51 -0400
message:
Update tutorial text (Matthew Fuller)
------------------------------------------------------------
revno: 2495.4.14
revision-id: fullermd at over-yonder.net-20070606095255-zogzpvrnhh5su387
parent: fullermd at over-yonder.net-20070606094841-btejyqo11l309q1j
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Wed 2007-06-06 04:52:55 -0500
message:
Be more consistent about using `` around options and filenames.
------------------------------------------------------------
revno: 2495.4.13
revision-id: fullermd at over-yonder.net-20070606094841-btejyqo11l309q1j
parent: fullermd at over-yonder.net-20070606094702-k1ney72w3wktv3ev
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Wed 2007-06-06 04:48:41 -0500
message:
$BZREMAIL has been spelt $BZR_EMAIL for almost a year now, so it's
probably time to tell the tutorial about it...
------------------------------------------------------------
revno: 2495.4.12
revision-id: fullermd at over-yonder.net-20070606094702-k1ney72w3wktv3ev
parent: fullermd at over-yonder.net-20070606093909-stozkguj77gorg94
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Wed 2007-06-06 04:47:02 -0500
message:
Adjust some stuff on the Introducing Yourself section so that it
literal's and blockquote's properly.
------------------------------------------------------------
revno: 2495.4.11
revision-id: fullermd at over-yonder.net-20070606093909-stozkguj77gorg94
parent: fullermd at over-yonder.net-20070606093102-icchoupo52p6eiyq
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Wed 2007-06-06 04:39:09 -0500
message:
Use `` instead of ` around a bunch of options and env variable namings
when talking about editor settings.
------------------------------------------------------------
revno: 2495.4.10
revision-id: fullermd at over-yonder.net-20070606093102-icchoupo52p6eiyq
parent: fullermd at over-yonder.net-20070530145253-hvlcypma2jhexcvk
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: tutorial-updates
timestamp: Wed 2007-06-06 04:31:02 -0500
message:
Be consistent about using `` instead of ** around commands.
There are some places that command _names_ are left in **'s, on the
theory that they're really describing concepts rather than commands.
------------------------------------------------------------
revno: 2495.2.3
revision-id: abentley at panoramicfeedback.com-20070607125207-8ss1ncu3m88fgfqm
parent: aaron.bentley at utoronto.ca-20070527184754-p0w83p0v54ejks8s
parent: pqm at pqm.ubuntu.com-20070607002124-64z9d0o6x0e9iwbl
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: bzr.docs
timestamp: Thu 2007-06-07 08:52:07 -0400
message:
merge from bzr.dev
------------------------------------------------------------
revno: 2506.1.10
revision-id: pqm at pqm.ubuntu.com-20070607132155-dn02612f4o14a1no
parent: pqm at pqm.ubuntu.com-20070607002124-64z9d0o6x0e9iwbl
parent: abentley at panoramicfeedback.com-20070607124900-fs2sa702jkh7mgoo
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-07 14:21:55 +0100
message:
Tests don't fail when BZR_REMOTE_PATH is set. (Daniel Watkins, #111958)
------------------------------------------------------------
revno: 2506.1.9.1.1
revision-id: abentley at panoramicfeedback.com-20070607124900-fs2sa702jkh7mgoo
parent: pqm at pqm.ubuntu.com-20070607002124-64z9d0o6x0e9iwbl
parent: d.m.watkins at warwick.ac.uk-20070606232052-rnhuzphraoztizol
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Thu 2007-06-07 08:49:00 -0400
message:
Tests don't fail when BZR_REMOTE_PATH is set. (Daniel Watkins, #111958)
------------------------------------------------------------
revno: 2506.1.6.3.2
revision-id: d.m.watkins at warwick.ac.uk-20070606232052-rnhuzphraoztizol
parent: d.m.watkins at warwick.ac.uk-20070606231655-d3ou86x6bjan2g5j
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 111958
timestamp: Thu 2007-06-07 00:20:52 +0100
message:
Updated NEWS to reflect bug fix.
------------------------------------------------------------
revno: 2506.1.6.3.1
revision-id: d.m.watkins at warwick.ac.uk-20070606231655-d3ou86x6bjan2g5j
parent: pqm at pqm.ubuntu.com-20070606083714-rt2za45t9gt5nqqh
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: 111958
timestamp: Thu 2007-06-07 00:16:55 +0100
message:
Added BZR_REMOTE_PATH to the list of environment variables cleaned before running tests, fixing bug #111958.
------------------------------------------------------------
revno: 2506.1.9
revision-id: pqm at pqm.ubuntu.com-20070607002124-64z9d0o6x0e9iwbl
parent: pqm at pqm.ubuntu.com-20070606201738-u5pu5rxhdoyehimv
parent: aaron.bentley at utoronto.ca-20070606235207-3pu0d9xsweqlxt55
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-06-07 01:21:24 +0100
message:
Various fixes for revision-info (Metthew Fuller)
------------------------------------------------------------
revno: 2506.1.8.1.1
revision-id: aaron.bentley at utoronto.ca-20070606235207-3pu0d9xsweqlxt55
parent: pqm at pqm.ubuntu.com-20070606201738-u5pu5rxhdoyehimv
parent: fullermd at over-yonder.net-20070606113402-gyuk793gumqrfjrm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: bzr.ab.integration
timestamp: Wed 2007-06-06 19:52:07 -0400
message:
Various fixes for revision-info (Metthew Fuller)
------------------------------------------------------------
revno: 2506.1.6.2.4
revision-id: fullermd at over-yonder.net-20070606113402-gyuk793gumqrfjrm
parent: fullermd at over-yonder.net-20070606105410-b7gb18p3qw8vrzk8
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: revision-info
timestamp: Wed 2007-06-06 06:34:02 -0500
message:
Rewrite revision-info blackbox tests to test:
- Support for dotted revnos
- Defaulting to head of branch if no rev given
- Functioning without working tree
------------------------------------------------------------
revno: 2506.1.6.2.3
revision-id: fullermd at over-yonder.net-20070606105410-b7gb18p3qw8vrzk8
parent: fullermd at over-yonder.net-20070606104510-75dot0o1k4n396ju
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: revision-info
timestamp: Wed 2007-06-06 05:54:10 -0500
message:
Default revision-info to the head of the branch when no revision is
given.
------------------------------------------------------------
revno: 2506.1.6.2.2
revision-id: fullermd at over-yonder.net-20070606104510-75dot0o1k4n396ju
parent: fullermd at over-yonder.net-20070606102332-i7n2yh30rh8noob7
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: revision-info
timestamp: Wed 2007-06-06 05:45:10 -0500
message:
Update revision-info to show dotted revnos.
------------------------------------------------------------
revno: 2506.1.6.2.1
revision-id: fullermd at over-yonder.net-20070606102332-i7n2yh30rh8noob7
parent: pqm at pqm.ubuntu.com-20070606083714-rt2za45t9gt5nqqh
committer: Matthew Fuller <fullermd at over-yonder.net>
branch nick: revision-info
timestamp: Wed 2007-06-06 05:23:32 -0500
message:
revision-info has no call to need a WorkingTree, so don't demand one.
------------------------------------------------------------
revno: 2506.1.8
revision-id: pqm at pqm.ubuntu.com-20070606201738-u5pu5rxhdoyehimv
parent: pqm at pqm.ubuntu.com-20070606144200-rmsd3gyelimh8kal
parent: john at arbash-meinel.com-20070606194439-q12591hd09d4cv1g
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 21:17:38 +0100
message:
(Antonin 'gree' Komenda) simple update for bash completion.
------------------------------------------------------------
revno: 2506.1.6.1.1
revision-id: john at arbash-meinel.com-20070606194439-q12591hd09d4cv1g
parent: pqm at pqm.ubuntu.com-20070606083714-rt2za45t9gt5nqqh
parent: gree at grees.net-20070514122826-9ble6v16x6ni6rzz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Wed 2007-06-06 14:44:39 -0500
message:
(Antonin 'gree' Komenda) simple update for bash completion.
------------------------------------------------------------
revno: 2485.5.1
revision-id: gree at grees.net-20070514122826-9ble6v16x6ni6rzz
parent: pqm at pqm.ubuntu.com-20070510055501-w262sk5hl33vmd19
committer: gree <gree at grees.net>
branch nick: bzr.grees
timestamp: Mon 2007-05-14 14:28:26 +0200
message:
bash completion - fixed simple completion (don't include textual info about command into completion)
------------------------------------------------------------
revno: 2506.1.7
revision-id: pqm at pqm.ubuntu.com-20070606144200-rmsd3gyelimh8kal
parent: pqm at pqm.ubuntu.com-20070606083714-rt2za45t9gt5nqqh
parent: ian.clatworthy at internode.on.net-20070606061745-e5zl32uwku409wca
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 15:42:00 +0100
message:
(Ian Clatworthy) Improve 'bzr commit' time by removing some lock and dirstate._validate() calls
------------------------------------------------------------
revno: 2506.1.5.1.4
revision-id: ian.clatworthy at internode.on.net-20070606061745-e5zl32uwku409wca
parent: ian.clatworthy at internode.on.net-20070606061158-zbwatmjd2m1p474g
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.fast-commit
timestamp: Wed 2007-06-06 16:17:45 +1000
message:
updated NEWS and added commit performance notes to doc/developers
------------------------------------------------------------
revno: 2506.1.5.1.3
revision-id: ian.clatworthy at internode.on.net-20070606061158-zbwatmjd2m1p474g
parent: ian.clatworthy at internode.on.net-20070606060745-xchfmk7d9vckgy3r
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.fast-commit
timestamp: Wed 2007-06-06 16:11:58 +1000
message:
remove implicit read locks for kind() and is_executable() in wt4
------------------------------------------------------------
revno: 2506.1.5.1.2
revision-id: ian.clatworthy at internode.on.net-20070606060745-xchfmk7d9vckgy3r
parent: ian.clatworthy at internode.on.net-20070606055603-monl116zotkbqn2y
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.fast-commit
timestamp: Wed 2007-06-06 16:07:45 +1000
message:
remove calls to dirstate._validate() that shouldn't be on production code
------------------------------------------------------------
revno: 2506.1.5.1.1
revision-id: ian.clatworthy at internode.on.net-20070606055603-monl116zotkbqn2y
parent: pqm at pqm.ubuntu.com-20070606050006-o4yiw7jnwytgf561
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.fast-commit
timestamp: Wed 2007-06-06 15:56:03 +1000
message:
commit.py clean-up including logging just to stderr, not bzr.log
------------------------------------------------------------
revno: 2506.1.6
revision-id: pqm at pqm.ubuntu.com-20070606083714-rt2za45t9gt5nqqh
parent: pqm at pqm.ubuntu.com-20070606050006-o4yiw7jnwytgf561
parent: bialix at ukr.net-20070606075700-fefq7kluy10inv0m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 09:37:14 +0100
message:
(bialix,r=john,r=aaron) sanitize dev docs (performance-roadmap) &
win32 installers improvements
------------------------------------------------------------
revno: 2506.2.4
revision-id: bialix at ukr.net-20070606075700-fefq7kluy10inv0m
parent: bialix at ukr.net-20070606074514-qq7bxr0x2uj8c5c2
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer-0.17
timestamp: Wed 2007-06-06 10:57:00 +0300
message:
pack developers docs to windows installers
------------------------------------------------------------
revno: 2506.2.3
revision-id: bialix at ukr.net-20070606074514-qq7bxr0x2uj8c5c2
parent: bialix at ukr.net-20070606071152-a2jaa16xqvu92teg
parent: pqm at pqm.ubuntu.com-20070606050006-o4yiw7jnwytgf561
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer-0.17
timestamp: Wed 2007-06-06 10:45:14 +0300
message:
merge bzr.dev; fix ReST formatting in planned-performance-changes.txt
------------------------------------------------------------
revno: 2506.2.2
revision-id: bialix at ukr.net-20070606071152-a2jaa16xqvu92teg
parent: bialix at ukr.net-20070605080204-hvhqw69njlpxcscb
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer-0.17
timestamp: Wed 2007-06-06 10:11:52 +0300
message:
better wording suggested by John Meinel
------------------------------------------------------------
revno: 2506.2.1
revision-id: bialix at ukr.net-20070605080204-hvhqw69njlpxcscb
parent: pqm at pqm.ubuntu.com-20070604194535-ihhpf84qp0icoj2t
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer-0.17
timestamp: Tue 2007-06-05 11:02:04 +0300
message:
sanitize developers docs
------------------------------------------------------------
revno: 2506.1.5
revision-id: pqm at pqm.ubuntu.com-20070606050006-o4yiw7jnwytgf561
parent: pqm at pqm.ubuntu.com-20070606043217-jlt8hu49sk54tsag
parent: aaron.bentley at utoronto.ca-20070606041017-c8wds05ilv5jokkz
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 06:00:06 +0100
message:
Update style of TreeTransform._rename_in_limbo
------------------------------------------------------------
revno: 2502.1.14
revision-id: aaron.bentley at utoronto.ca-20070606041017-c8wds05ilv5jokkz
parent: aaron.bentley at utoronto.ca-20070606012818-ubf8cmaj1imntttb
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Wed 2007-06-06 00:10:17 -0400
message:
Style update suggested by Robert
------------------------------------------------------------
revno: 2506.1.4
revision-id: pqm at pqm.ubuntu.com-20070606043217-jlt8hu49sk54tsag
parent: pqm at pqm.ubuntu.com-20070606022703-i49zqzf2wa4kq7fr
parent: aaron.bentley at utoronto.ca-20070606015055-h01xm6jeddm630up
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 05:32:17 +0100
message:
Don't crash on merging renames of deleted files (#110279)
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.15.1.3
revision-id: aaron.bentley at utoronto.ca-20070606015055-h01xm6jeddm630up
parent: aaron.bentley at utoronto.ca-20070606010725-cusa72npg70khhkk
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-05 21:50:55 -0400
message:
Rename test case
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.15.1.2
revision-id: aaron.bentley at utoronto.ca-20070606010725-cusa72npg70khhkk
parent: aaron.bentley at utoronto.ca-20070606010518-kmhq36e8pomuzio7
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-05 21:07:25 -0400
message:
Don't crash on merging renamed deleted files (#110279)
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.17.1.15.1.1
revision-id: aaron.bentley at utoronto.ca-20070606010518-kmhq36e8pomuzio7
parent: abentley at panoramicfeedback.com-20070524153619-o4ici00lpcmbshiw
parent: pqm at pqm.ubuntu.com-20070605164810-ay1hxyvqofffy0me
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-06-05 21:05:18 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2506.1.3
revision-id: pqm at pqm.ubuntu.com-20070606022703-i49zqzf2wa4kq7fr
parent: pqm at pqm.ubuntu.com-20070606015859-rwlz810cte7l1row
parent: aaron.bentley at utoronto.ca-20070606012818-ubf8cmaj1imntttb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 03:27:03 +0100
message:
Cancelling directories with cancelled children works correctly
------------------------------------------------------------
revno: 2502.1.13
revision-id: aaron.bentley at utoronto.ca-20070606012818-ubf8cmaj1imntttb
parent: aaron.bentley at utoronto.ca-20070605223321-69qk2lxdg9d554at
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Tue 2007-06-05 21:28:18 -0400
message:
Updates from review
------------------------------------------------------------
revno: 2502.1.12
revision-id: aaron.bentley at utoronto.ca-20070605223321-69qk2lxdg9d554at
parent: abentley at panoramicfeedback.com-20070605161922-0j7x00tazfnh5zf1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Tue 2007-06-05 18:33:21 -0400
message:
Avoid renaming children with no content
------------------------------------------------------------
revno: 2506.1.2
revision-id: pqm at pqm.ubuntu.com-20070606015859-rwlz810cte7l1row
parent: pqm at pqm.ubuntu.com-20070605164810-ay1hxyvqofffy0me
parent: robertc at robertcollins.net-20070606010722-21uhn0868sm5m2he
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-06-06 02:58:59 +0100
message:
(robertc) Create the top level changes-list from the London sprint for reference.
------------------------------------------------------------
revno: 2506.1.1.1.1
revision-id: robertc at robertcollins.net-20070606010722-21uhn0868sm5m2he
parent: pqm at pqm.ubuntu.com-20070605164810-ay1hxyvqofffy0me
parent: robertc at robertcollins.net-20070606010158-aqtdldnzo5bj5z74
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2007-06-06 11:07:22 +1000
message:
(robertc) Create the top level changes-list from the London sprint for reference.
------------------------------------------------------------
revno: 2485.4.10
revision-id: robertc at robertcollins.net-20070606010158-aqtdldnzo5bj5z74
parent: robertc at robertcollins.net-20070604053802-cx9toxyasgfip83n
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Wed 2007-06-06 11:01:58 +1000
message:
Review feedback.
------------------------------------------------------------
revno: 2485.4.9
revision-id: robertc at robertcollins.net-20070604053802-cx9toxyasgfip83n
parent: robertc at robertcollins.net-20070604040720-c5ti0k49w0ye8zcl
committer: Robert Collins <robertc at robertcollins.net>
branch nick: roadmap
timestamp: Mon 2007-06-04 15:38:02 +1000
message:
Create the top level changes-list from the London sprint for reference.
------------------------------------------------------------
revno: 2506.1.1
revision-id: pqm at pqm.ubuntu.com-20070605164810-ay1hxyvqofffy0me
parent: pqm at pqm.ubuntu.com-20070604194535-ihhpf84qp0icoj2t
parent: abentley at panoramicfeedback.com-20070605161922-0j7x00tazfnh5zf1
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-06-05 17:48:10 +0100
message:
Optimize TreeTransform to avoid renames where possible
------------------------------------------------------------
revno: 2502.1.11
revision-id: abentley at panoramicfeedback.com-20070605161922-0j7x00tazfnh5zf1
parent: abentley at panoramicfeedback.com-20070605161828-5spb276vsp8fxjx8
parent: pqm at pqm.ubuntu.com-20070604194535-ihhpf84qp0icoj2t
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fast-checkout
timestamp: Tue 2007-06-05 12:19:22 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 2502.1.10
revision-id: abentley at panoramicfeedback.com-20070605161828-5spb276vsp8fxjx8
parent: abentley at panoramicfeedback.com-20070605154520-kw4foazx2ayumzpr
parent: aaron.bentley at utoronto.ca-20070603220035-p9mqj3zzus8ew1bz
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fast-checkout
timestamp: Tue 2007-06-05 12:18:28 -0400
message:
Merge NEWS
------------------------------------------------------------
revno: 2502.1.5.1.2
revision-id: aaron.bentley at utoronto.ca-20070603220035-p9mqj3zzus8ew1bz
parent: aaron.bentley at utoronto.ca-20070603215101-oljwf5m6fen1s6q1
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Sun 2007-06-03 18:00:35 -0400
message:
Fix NEWS
------------------------------------------------------------
revno: 2502.1.5.1.1
revision-id: aaron.bentley at utoronto.ca-20070603215101-oljwf5m6fen1s6q1
parent: aaron.bentley at utoronto.ca-20070603163308-r6el1wy9cvj9h6h2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Sun 2007-06-03 17:51:01 -0400
message:
Add NEWS entry
------------------------------------------------------------
revno: 2502.1.9
revision-id: abentley at panoramicfeedback.com-20070605154520-kw4foazx2ayumzpr
parent: abentley at panoramicfeedback.com-20070605141443-wb5xay9e02lnzk76
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fast-checkout
timestamp: Tue 2007-06-05 11:45:20 -0400
message:
Add additional test for no-name contents
------------------------------------------------------------
revno: 2502.1.8
revision-id: abentley at panoramicfeedback.com-20070605141443-wb5xay9e02lnzk76
parent: abentley at panoramicfeedback.com-20070604170453-eo9440menna0peju
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fast-checkout
timestamp: Tue 2007-06-05 10:14:43 -0400
message:
Updates from review comments
------------------------------------------------------------
revno: 2502.1.7
revision-id: abentley at panoramicfeedback.com-20070604170453-eo9440menna0peju
parent: abentley at panoramicfeedback.com-20070604165336-ehy5ckbw9dtbpb78
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fast-checkout
timestamp: Mon 2007-06-04 13:04:53 -0400
message:
Fix finalize deletion ordering
------------------------------------------------------------
revno: 2502.1.6
revision-id: abentley at panoramicfeedback.com-20070604165336-ehy5ckbw9dtbpb78
parent: aaron.bentley at utoronto.ca-20070603163308-r6el1wy9cvj9h6h2
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: fast-checkout
timestamp: Mon 2007-06-04 12:53:36 -0400
message:
Update from review comments
------------------------------------------------------------
revno: 2502.1.5
revision-id: aaron.bentley at utoronto.ca-20070603163308-r6el1wy9cvj9h6h2
parent: aaron.bentley at utoronto.ca-20070603155659-rimfmfeyw7zgbgzm
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Sun 2007-06-03 12:33:08 -0400
message:
Cleanup
------------------------------------------------------------
revno: 2502.1.4
revision-id: aaron.bentley at utoronto.ca-20070603155659-rimfmfeyw7zgbgzm
parent: aaron.bentley at utoronto.ca-20070603041408-j30fz6nncfm9vgtr
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Sun 2007-06-03 11:56:59 -0400
message:
Ensure we only reuse limbo names appropriately
------------------------------------------------------------
revno: 2502.1.3
revision-id: aaron.bentley at utoronto.ca-20070603041408-j30fz6nncfm9vgtr
parent: aaron.bentley at utoronto.ca-20070602154854-dxx6c0hbjm2h1jel
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Sun 2007-06-03 00:14:08 -0400
message:
Don't cause errors when creating contents for trans_ids with no parent/name
------------------------------------------------------------
revno: 2502.1.2
revision-id: aaron.bentley at utoronto.ca-20070602154854-dxx6c0hbjm2h1jel
parent: aaron.bentley at utoronto.ca-20070602000645-51h5g95v86g8305g
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Sat 2007-06-02 11:48:54 -0400
message:
Make the limited-renames functionality safer in the general case
------------------------------------------------------------
revno: 2502.1.1
revision-id: aaron.bentley at utoronto.ca-20070602000645-51h5g95v86g8305g
parent: pqm at pqm.ubuntu.com-20070601221655-eeiryluirj5h73hp
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: fast-checkout
timestamp: Fri 2007-06-01 20:06:45 -0400
message:
Ensure renames only root children are renamed when building trees
------------------------------------------------------------
revno: 2509.1.3
revision-id: andrew.bennetts at canonical.com-20070613105446-ukb9knp9dmy57v74
parent: andrew.bennetts at canonical.com-20070613105312-z94x8g4y5mlg4ukg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Wed 2007-06-13 20:54:46 +1000
message:
Change format marker to use the word 'Bazaar' rather than 'bzr'.
------------------------------------------------------------
revno: 2509.1.2
revision-id: andrew.bennetts at canonical.com-20070613105312-z94x8g4y5mlg4ukg
parent: andrew.bennetts at canonical.com-20070613075835-sb1o923hdtwnmlrv
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Wed 2007-06-13 20:53:12 +1000
message:
Raise InvalidRecordError on invalid names.
------------------------------------------------------------
revno: 2509.1.1
revision-id: andrew.bennetts at canonical.com-20070613075835-sb1o923hdtwnmlrv
parent: andrew.bennetts at canonical.com-20070612015639-z378i21fmcnd5j4x
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: container-format
timestamp: Wed 2007-06-13 17:58:35 +1000
message:
Remove duplicate definition of ContainerWriter.
Diff too large for email (3661 lines, the limit is 1000).
More information about the bazaar-commits
mailing list