Rev 3569: Bring in the 1.7 branch in http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/merge_lca_multi
John Arbash Meinel
john at arbash-meinel.com
Wed Sep 24 13:53:39 BST 2008
At http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/merge_lca_multi
------------------------------------------------------------
revno: 3569
revision-id: john at arbash-meinel.com-20080924125322-p1i7pnr0m49v1hze
parent: john at arbash-meinel.com-20080924125122-0893ip9kz0ik5cjt
parent: pqm at pqm.ubuntu.com-20080923164635-it2hzrn39wpbhh9e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_lca_multi
timestamp: Wed 2008-09-24 07:53:22 -0500
message:
Bring in the 1.7 branch
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr.ico bzr.ico-20060629083000-q18ip0hk7lq55i4y-1
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/message.py message.py-20080222013625-ncqmh3nrxjkxab87-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
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_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
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
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3514.51.138
revision-id: pqm at pqm.ubuntu.com-20080923164635-it2hzrn39wpbhh9e
parent: pqm at pqm.ubuntu.com-20080917234114-mx3kwcbibtdfzc02
parent: john at arbash-meinel.com-20080923161454-eoft8u1jcqqji9cg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.7
timestamp: Tue 2008-09-23 17:46:35 +0100
message:
(jam) bring in Mark Hammonds setup tweaks, release bzr 1.7 final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3514.207.3
revision-id: john at arbash-meinel.com-20080923161454-eoft8u1jcqqji9cg
parent: john at arbash-meinel.com-20080923161207-5cvoirch1q0zm81t
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.7rc2
timestamp: Tue 2008-09-23 11:14:54 -0500
message:
Update NEWS, release 1.7 final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3514.207.2
revision-id: john at arbash-meinel.com-20080923161207-5cvoirch1q0zm81t
parent: john at arbash-meinel.com-20080923161049-zqvuu0wzew3ilrk5
parent: mhammond at skippinet.com.au-20080903131033-77635gwnys1nr877
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.7rc2
timestamp: Tue 2008-09-23 11:12:07 -0500
message:
Include localization files that are found in plugins we are installing.
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3514.208.1
revision-id: mhammond at skippinet.com.au-20080903131033-77635gwnys1nr877
parent: pqm at pqm.ubuntu.com-20080903094659-lkj3i4hd83d35fov
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.binaries.17
timestamp: Wed 2008-09-03 23:10:33 +1000
message:
pickup l10n files from plugins.
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3514.207.1
revision-id: john at arbash-meinel.com-20080923161049-zqvuu0wzew3ilrk5
parent: pqm at pqm.ubuntu.com-20080917234114-mx3kwcbibtdfzc02
parent: mhammond at skippinet.com.au-20080919040809-6uyf76hisqk38civ
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.7rc2
timestamp: Tue 2008-09-23 11:10:49 -0500
message:
Include docutils as part of the qbzr setup
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3514.206.1
revision-id: mhammond at skippinet.com.au-20080919040809-6uyf76hisqk38civ
parent: pqm at pqm.ubuntu.com-20080917234114-mx3kwcbibtdfzc02
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.binaries.17
timestamp: Fri 2008-09-19 14:08:09 +1000
message:
include docutils for tbzr to use formatting bzr help topics as HTML
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3514.51.137
revision-id: pqm at pqm.ubuntu.com-20080917234114-mx3kwcbibtdfzc02
parent: pqm at pqm.ubuntu.com-20080917051135-akewztrabntc2sec
parent: john at arbash-meinel.com-20080917230918-l3hozsoph343oj87
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.7
timestamp: Thu 2008-09-18 00:41:14 +0100
message:
(jam) Prepare 1.7rc2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3514.205.2
revision-id: john at arbash-meinel.com-20080917230918-l3hozsoph343oj87
parent: john at arbash-meinel.com-20080917230733-rg4y53rt8hmbok8f
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.7rc2
timestamp: Wed 2008-09-17 18:09:18 -0500
message:
NEWS summary for 1.7rc2
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3514.205.1
revision-id: john at arbash-meinel.com-20080917230733-rg4y53rt8hmbok8f
parent: pqm at pqm.ubuntu.com-20080917051135-akewztrabntc2sec
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.7rc2
timestamp: Wed 2008-09-17 18:07:33 -0500
message:
NEWS entry for #261315
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3514.51.136
revision-id: pqm at pqm.ubuntu.com-20080917051135-akewztrabntc2sec
parent: pqm at pqm.ubuntu.com-20080916224734-ggoasnd8egrezi9t
parent: mbp at sourcefrog.net-20080917043324-gpo0wyot7r43hgkp
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.7
timestamp: Wed 2008-09-17 06:11:35 +0100
message:
(mbp) #261315 add Branch.get_stacked_on_url rpc and fallback
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3514.204.1
revision-id: mbp at sourcefrog.net-20080917043324-gpo0wyot7r43hgkp
parent: pqm at pqm.ubuntu.com-20080916224734-ggoasnd8egrezi9t
parent: mbp at sourcefrog.net-20080915142719-60n7juikbylf89qx
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 261315-into-1.7
timestamp: Wed 2008-09-17 14:33:24 +1000
message:
Merge 261315 fix into 1.7 branch
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3514.203.12
revision-id: mbp at sourcefrog.net-20080915142719-60n7juikbylf89qx
parent: mbp at sourcefrog.net-20080915140805-b7cf7j7urwojfmla
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 261315-stacked-hpss
timestamp: Tue 2008-09-16 00:27:19 +1000
message:
Add test for coping without Branch.get_stacked_on_url
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3514.203.11
revision-id: mbp at sourcefrog.net-20080915140805-b7cf7j7urwojfmla
parent: mbp at sourcefrog.net-20080915133721-11nay4wx6n89ep0l
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 261315-stacked-hpss
timestamp: Tue 2008-09-16 00:08:05 +1000
message:
More tests around RemoteBranch stacking.
Now passing its integration test.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3514.203.10
revision-id: mbp at sourcefrog.net-20080915133721-11nay4wx6n89ep0l
parent: mbp at sourcefrog.net-20080915130437-j198hsc8r6ayeq7s
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 261315-stacked-hpss
timestamp: Mon 2008-09-15 23:37:21 +1000
message:
Update more test_remote tests
modified:
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3514.203.9
revision-id: mbp at sourcefrog.net-20080915130437-j198hsc8r6ayeq7s
parent: mbp at sourcefrog.net-20080915125506-x8qnoxg8tcsjtix4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 261315-stacked-hpss
timestamp: Mon 2008-09-15 23:04:37 +1000
message:
Convert and update more test_remote tests
modified:
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3514.203.8
revision-id: mbp at sourcefrog.net-20080915125506-x8qnoxg8tcsjtix4
parent: mbp at sourcefrog.net-20080915112015-taqk86xpt7vhj71r
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 261315-stacked-hpss
timestamp: Mon 2008-09-15 22:55:06 +1000
message:
Update some test_remote tests for Branch.get_stacked_on_url and with clearer assertions
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3514.203.7
revision-id: mbp at sourcefrog.net-20080915112015-taqk86xpt7vhj71r
parent: mbp at sourcefrog.net-20080915094216-g4cnw14q7m1u4n14
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 261315-stacked-hpss
timestamp: Mon 2008-09-15 21:20:15 +1000
message:
FakeClient can know what calls to expect
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3514.203.6
revision-id: mbp at sourcefrog.net-20080915094216-g4cnw14q7m1u4n14
parent: mbp at sourcefrog.net-20080915062827-idpp07pfwchedixn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 261315-stacked-hpss
timestamp: Mon 2008-09-15 19:42:16 +1000
message:
Disable RemoteBranch stacking, but get get_stacked_on_url working, and passing back exceptions
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3514.203.5
revision-id: mbp at sourcefrog.net-20080915062827-idpp07pfwchedixn
parent: mbp at sourcefrog.net-20080915053148-c6j63kplre0jjvg7
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 261315-stacked-hpss
timestamp: Mon 2008-09-15 16:28:27 +1000
message:
Add Branch.get_stacked_on_url rpc and tests for same
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3514.203.4
revision-id: mbp at sourcefrog.net-20080915053148-c6j63kplre0jjvg7
parent: mbp at sourcefrog.net-20080915051617-4wynqee2yyy1kb0y
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 261315-stacked-hpss
timestamp: Mon 2008-09-15 15:31:48 +1000
message:
Add FakeRemoteTransport to clarify test_remote
modified:
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3514.203.3
revision-id: mbp at sourcefrog.net-20080915051617-4wynqee2yyy1kb0y
parent: mbp at sourcefrog.net-20080905110534-x17o0plqu70umd61
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 261315-stacked-hpss
timestamp: Mon 2008-09-15 15:16:17 +1000
message:
Factor out RemoteBranch._remote_path() and disable RemoteBranch stacking
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3514.203.2
revision-id: mbp at sourcefrog.net-20080905110534-x17o0plqu70umd61
parent: mbp at sourcefrog.net-20080905081830-tq89v5d0yinh7012
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 261315-stacked-hpss
timestamp: Fri 2008-09-05 21:05:34 +1000
message:
Fix some problems in access to stacked repositories over hpss (#261315)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3514.203.1
revision-id: mbp at sourcefrog.net-20080905081830-tq89v5d0yinh7012
parent: pqm at pqm.ubuntu.com-20080905013604-6zvq8467ip7l4m9i
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 261315-stacked-hpss
timestamp: Fri 2008-09-05 18:18:30 +1000
message:
RemoteBranch must configure stacking into the repository
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3514.51.135
revision-id: pqm at pqm.ubuntu.com-20080916224734-ggoasnd8egrezi9t
parent: pqm at pqm.ubuntu.com-20080916001152-wi5calcm4ic36lee
parent: john at arbash-meinel.com-20080916221549-lo8bj6i2ve3yt6zl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.7
timestamp: Tue 2008-09-16 23:47:34 +0100
message:
Some small fixes for bzr 1.7rc2, prepare the version strings.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
------------------------------------------------------------
revno: 3514.201.6
revision-id: john at arbash-meinel.com-20080916221549-lo8bj6i2ve3yt6zl
parent: john at arbash-meinel.com-20080916213928-lmb6zxe665ofjocp
parent: pqm at pqm.ubuntu.com-20080916001152-wi5calcm4ic36lee
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.7rc2
timestamp: Tue 2008-09-16 17:15:49 -0500
message:
Merge and resolve NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3514.201.5
revision-id: john at arbash-meinel.com-20080916213928-lmb6zxe665ofjocp
parent: john at arbash-meinel.com-20080916213829-g18jj2b94k70fkxj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.7rc2
timestamp: Tue 2008-09-16 16:39:28 -0500
message:
Fix version strings.
modified:
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3514.201.4
revision-id: john at arbash-meinel.com-20080916213829-g18jj2b94k70fkxj
parent: john at arbash-meinel.com-20080916213652-c1g72d1oyqtqw3bi
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.7rc2
timestamp: Tue 2008-09-16 16:38:29 -0500
message:
Merge vila's init[-repo] changes and add a NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
------------------------------------------------------------
revno: 3514.201.3
revision-id: john at arbash-meinel.com-20080916213652-c1g72d1oyqtqw3bi
parent: john at arbash-meinel.com-20080916213541-u1pdcwlt1pjlcmbz
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.7rc2
timestamp: Tue 2008-09-16 16:36:52 -0500
message:
NEWS for Andrew
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3514.201.2
revision-id: john at arbash-meinel.com-20080916213541-u1pdcwlt1pjlcmbz
parent: john at arbash-meinel.com-20080911211222-s2strfs3qt1iih7i
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.7rc2
timestamp: Tue 2008-09-16 16:35:41 -0500
message:
Merge Andrew's wrong repo format from Remote patch
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3514.51.134
revision-id: pqm at pqm.ubuntu.com-20080916001152-wi5calcm4ic36lee
parent: pqm at pqm.ubuntu.com-20080912073013-ywmlk6bqm1ea9erw
parent: andrew.bennetts at canonical.com-20080915233859-k9e262s7fqx045yi
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.7
timestamp: Tue 2008-09-16 01:11:52 +0100
message:
Branching from a shared repository on a smart server now preserves
repository format (Andrew Bennetts)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3514.202.3
revision-id: andrew.bennetts at canonical.com-20080915233859-k9e262s7fqx045yi
parent: andrew.bennetts at canonical.com-20080915015457-dm7k7pkqpubn7pty
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: wrong-repo-format-1.7
timestamp: Tue 2008-09-16 09:38:59 +1000
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3514.202.2
revision-id: andrew.bennetts at canonical.com-20080915015457-dm7k7pkqpubn7pty
parent: andrew.bennetts at canonical.com-20080915010834-s98gwvotes1mfu55
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: wrong-repo-format-1.7
timestamp: Mon 2008-09-15 11:54:57 +1000
message:
Add test for preserving shared repository format when sprouting from a smart server.
modified:
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3514.202.1
revision-id: andrew.bennetts at canonical.com-20080915010834-s98gwvotes1mfu55
parent: pqm at pqm.ubuntu.com-20080912073013-ywmlk6bqm1ea9erw
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: wrong-repo-format-1.7
timestamp: Mon 2008-09-15 11:08:34 +1000
message:
Possible fix for bug 269214
modified:
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
------------------------------------------------------------
revno: 3514.51.133
revision-id: pqm at pqm.ubuntu.com-20080912073013-ywmlk6bqm1ea9erw
parent: pqm at pqm.ubuntu.com-20080910041720-8c3wxgxrciqwxumq
parent: john at arbash-meinel.com-20080911211222-s2strfs3qt1iih7i
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.7
timestamp: Fri 2008-09-12 08:30:13 +0100
message:
(spiv) Fix '_in_buffer' AttributeError when using the -Dhpss debug
flag.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/smart/message.py message.py-20080222013625-ncqmh3nrxjkxab87-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
------------------------------------------------------------
revno: 3514.201.1
revision-id: john at arbash-meinel.com-20080911211222-s2strfs3qt1iih7i
parent: pqm at pqm.ubuntu.com-20080910041720-8c3wxgxrciqwxumq
author: Andrew Bennetts <andrew.bennetts at canonical.com>
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: 1.7rc2
timestamp: Thu 2008-09-11 16:12:22 -0500
message:
Cherrypick Andrew's _get_buffer fix
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/smart/message.py message.py-20080222013625-ncqmh3nrxjkxab87-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
------------------------------------------------------------
revno: 3514.51.132
revision-id: pqm at pqm.ubuntu.com-20080910041720-8c3wxgxrciqwxumq
parent: pqm at pqm.ubuntu.com-20080909220719-o6ma8z56i4er1htl
parent: john at arbash-meinel.com-20080910034639-peesekud7vl6cpty
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.7
timestamp: Wed 2008-09-10 05:17:20 +0100
message:
Fix up NEWS for 1.7rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3514.200.1
revision-id: john at arbash-meinel.com-20080910034639-peesekud7vl6cpty
parent: pqm at pqm.ubuntu.com-20080909220719-o6ma8z56i4er1htl
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2008-09-09 22:46:39 -0500
message:
Fix NEWS for proper 1.7rc1 release.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3514.51.131
revision-id: pqm at pqm.ubuntu.com-20080909220719-o6ma8z56i4er1htl
parent: pqm at pqm.ubuntu.com-20080909173348-5y4vo2tga9d19fpa
parent: john at arbash-meinel.com-20080909212730-xka2luwpzvz2o4f0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.7
timestamp: Tue 2008-09-09 23:07:19 +0100
message:
(jam) Prepare 1.7rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3514.199.1
revision-id: john at arbash-meinel.com-20080909212730-xka2luwpzvz2o4f0
parent: pqm at pqm.ubuntu.com-20080909173348-5y4vo2tga9d19fpa
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2008-09-09 16:27:30 -0500
message:
Prepare 1.7rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3514.51.130
revision-id: pqm at pqm.ubuntu.com-20080909173348-5y4vo2tga9d19fpa
parent: pqm at pqm.ubuntu.com-20080908061835-nz7hj7o0pms1nf9p
parent: john at arbash-meinel.com-20080909170221-svim3jw2mrz0amp3
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-09-09 18:33:48 +0100
message:
(Mark Hammond) Update bzr.ico, and include TBZR icons in installer.
modified:
bzr.ico bzr.ico-20060629083000-q18ip0hk7lq55i4y-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3514.198.3
revision-id: john at arbash-meinel.com-20080909170221-svim3jw2mrz0amp3
parent: mhammond at skippinet.com.au-20080904120301-x3tujl7hloy0o75j
author: Mark Hammond <mhammond at skippinet.com.au>
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2008-09-09 12:02:21 -0500
message:
An updated transparent icon for bzr.
modified:
bzr.ico bzr.ico-20060629083000-q18ip0hk7lq55i4y-1
------------------------------------------------------------
revno: 3514.198.2
revision-id: mhammond at skippinet.com.au-20080904120301-x3tujl7hloy0o75j
parent: mhammond at skippinet.com.au-20080904115040-ai5yum99nqz0azz2
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.binaries.17
timestamp: Thu 2008-09-04 22:03:01 +1000
message:
build the list of icons without changing directory.
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3514.198.1
revision-id: mhammond at skippinet.com.au-20080904115040-ai5yum99nqz0azz2
parent: pqm at pqm.ubuntu.com-20080903223056-b108iytb38xkznci
parent: mhammond at skippinet.com.au-20080903120907-0cgb5efq1gzhsh0b
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.binaries.17
timestamp: Thu 2008-09-04 21:50:40 +1000
message:
re-merge
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3514.197.1
revision-id: mhammond at skippinet.com.au-20080903120907-0cgb5efq1gzhsh0b
parent: pqm at pqm.ubuntu.com-20080903094659-lkj3i4hd83d35fov
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.binaries.17
timestamp: Wed 2008-09-03 22:09:07 +1000
message:
include tbzr icons in windows binary distributions
modified:
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3514.51.129
revision-id: pqm at pqm.ubuntu.com-20080908061835-nz7hj7o0pms1nf9p
parent: pqm at pqm.ubuntu.com-20080906102539-ss1fkx2csdcalqlc
parent: andrew.bennetts at canonical.com-20080908054927-q84h4v1c8dy91h92
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-09-08 07:18:35 +0100
message:
(trivial) Remove some unused imports,
fix two trivially broken raise statements. (Andrew Bennetts)
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/message.py message.py-20080222013625-ncqmh3nrxjkxab87-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
------------------------------------------------------------
revno: 3514.196.1
revision-id: andrew.bennetts at canonical.com-20080908054927-q84h4v1c8dy91h92
parent: pqm at pqm.ubuntu.com-20080906102539-ss1fkx2csdcalqlc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: trivial
timestamp: Mon 2008-09-08 15:49:27 +1000
message:
Remove some unused imports and fix a couple of trivially broken raise statements.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/smart/message.py message.py-20080222013625-ncqmh3nrxjkxab87-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
------------------------------------------------------------
revno: 3514.51.128
revision-id: pqm at pqm.ubuntu.com-20080906102539-ss1fkx2csdcalqlc
parent: pqm at pqm.ubuntu.com-20080905215441-14uu1ybru8397sy2
parent: andrew.bennetts at canonical.com-20080906095218-9k920hp0t6h9bif0
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-09-06 11:25:39 +0100
message:
Do not traceback on unexpected error responses from a smart server.
(Andrew Bennetts)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3514.195.2
revision-id: andrew.bennetts at canonical.com-20080906095218-9k920hp0t6h9bif0
parent: andrew.bennetts at canonical.com-20080905055253-lxvnx1ga91wxrxyj
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: nicer-error
timestamp: Sat 2008-09-06 19:52:18 +1000
message:
Rename UntranslateableErrorFromSmartServer -> UnknownErrorFromSmartServer.
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3514.195.1
revision-id: andrew.bennetts at canonical.com-20080905055253-lxvnx1ga91wxrxyj
parent: pqm at pqm.ubuntu.com-20080904180441-gssfmn0j6yw2vi0e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: nicer-error
timestamp: Fri 2008-09-05 15:52:53 +1000
message:
Unexpected error responses from a smart server no longer cause the client to traceback.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3514.51.127
revision-id: pqm at pqm.ubuntu.com-20080905215441-14uu1ybru8397sy2
parent: pqm at pqm.ubuntu.com-20080905212548-ig8wqqpv4vb8b2v4
parent: john at arbash-meinel.com-20080905201406-p6mf9wt3r38l5dxq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-09-05 22:54:41 +0100
message:
(jam) Merge in bzr 1.6.1 release
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3514.194.1
revision-id: john at arbash-meinel.com-20080905201406-p6mf9wt3r38l5dxq
parent: pqm at pqm.ubuntu.com-20080903223056-b108iytb38xkznci
parent: pqm at pqm.ubuntu.com-20080905195323-3gadc8dfqs61vy4e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2008-09-05 15:14:06 -0500
message:
Merge in bzr 1.6.1 release
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3514.119.17
revision-id: pqm at pqm.ubuntu.com-20080905195323-3gadc8dfqs61vy4e
parent: pqm at pqm.ubuntu.com-20080903164846-k1lc4d87315m26uh
parent: john at arbash-meinel.com-20080905192332-4j7a025l28ba26xk
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.6
timestamp: Fri 2008-09-05 20:53:23 +0100
message:
(jam) Release bzr 1.6.1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3514.193.1
revision-id: john at arbash-meinel.com-20080905192332-4j7a025l28ba26xk
parent: pqm at pqm.ubuntu.com-20080903164846-k1lc4d87315m26uh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Fri 2008-09-05 14:23:32 -0500
message:
Release bzr 1.6.1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3514.51.126
revision-id: pqm at pqm.ubuntu.com-20080905212548-ig8wqqpv4vb8b2v4
parent: pqm at pqm.ubuntu.com-20080905055502-uq3g4uwzl6agbyy4
parent: andrew.bennetts at canonical.com-20080905104803-6g72dz6wcldosfs2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-09-05 22:25:48 +0100
message:
(spiv) Fix bug #237067 by having RemoteBranch properly lock its
RemoteRepository.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3514.192.6
revision-id: andrew.bennetts at canonical.com-20080905104803-6g72dz6wcldosfs2
parent: andrew.bennetts at canonical.com-20080905102540-118qgqvl1a6nt019
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: objectnotlocked
timestamp: Fri 2008-09-05 20:48:03 +1000
message:
Remove monkey-patching of branch._ensure_real from test_remote.py.
modified:
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3514.192.5
revision-id: andrew.bennetts at canonical.com-20080905102540-118qgqvl1a6nt019
parent: andrew.bennetts at canonical.com-20080905102129-a7v2uzv07tdo495e
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: objectnotlocked
timestamp: Fri 2008-09-05 20:25:40 +1000
message:
Fix bug revealed by removing _ensure_real call from RemoteBranch.lock_write.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3514.192.4
revision-id: andrew.bennetts at canonical.com-20080905102129-a7v2uzv07tdo495e
parent: andrew.bennetts at canonical.com-20080905101704-6g8iio31vb1wb2pf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: objectnotlocked
timestamp: Fri 2008-09-05 20:21:29 +1000
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3514.192.3
revision-id: andrew.bennetts at canonical.com-20080905101704-6g8iio31vb1wb2pf
parent: andrew.bennetts at canonical.com-20080905085529-o3abc8tnazsx2qth
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: objectnotlocked
timestamp: Fri 2008-09-05 20:17:04 +1000
message:
Delete some cruft (like the _ensure_real call in RemoteBranch.lock_write), improve some comments, and wrap some long lines.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3514.192.2
revision-id: andrew.bennetts at canonical.com-20080905085529-o3abc8tnazsx2qth
parent: andrew.bennetts at canonical.com-20080905083730-mobjr4wfkz8rxdcr
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: objectnotlocked
timestamp: Fri 2008-09-05 18:55:29 +1000
message:
Fix regression introduced by fix, and add a test for that regression.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/branch_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-4
------------------------------------------------------------
revno: 3514.192.1
revision-id: andrew.bennetts at canonical.com-20080905083730-mobjr4wfkz8rxdcr
parent: pqm at pqm.ubuntu.com-20080905055502-uq3g4uwzl6agbyy4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: objectnotlocked
timestamp: Fri 2008-09-05 18:37:30 +1000
message:
Make RemoteBranch.lock_write lock the repository too.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3514.51.125
revision-id: pqm at pqm.ubuntu.com-20080905055502-uq3g4uwzl6agbyy4
parent: pqm at pqm.ubuntu.com-20080905013604-6zvq8467ip7l4m9i
parent: mbp at sourcefrog.net-20080905051235-am3gwu6qjwlgqkeo
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-09-05 06:55:02 +0100
message:
(mbp) Windows test fixes from markh
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
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: 3514.191.1
revision-id: mbp at sourcefrog.net-20080905051235-am3gwu6qjwlgqkeo
parent: pqm at pqm.ubuntu.com-20080905013604-6zvq8467ip7l4m9i
parent: mhammond at skippinet.com.au-20080815005423-x59t7pzm8igr66td
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Fri 2008-09-05 15:12:35 +1000
message:
Merge Windows test fixes
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
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: 3514.190.9
revision-id: mhammond at skippinet.com.au-20080815005423-x59t7pzm8igr66td
parent: mhammond at skippinet.com.au-20080815004504-2rzrodsu1ic8oesp
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.file_in_use
timestamp: Fri 2008-08-15 10:54:23 +1000
message:
Move check for os.link to the start of the test
modified:
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
------------------------------------------------------------
revno: 3514.190.8
revision-id: mhammond at skippinet.com.au-20080815004504-2rzrodsu1ic8oesp
parent: mhammond at skippinet.com.au-20080815004418-2s0jnsyyb7ra6an8
parent: pqm at pqm.ubuntu.com-20080814032324-mhfk4rggo7hgxeuf
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.file_in_use
timestamp: Fri 2008-08-15 10:45:04 +1000
message:
merge tip
added:
doc/en/developer-guide/testing.txt testing.txt-20080812140359-i70zzh6v2z7grqex-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_source.py test_source.py-20051207061333-a58dea6abecc030d
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/local.py local_transport.py-20050711165921-9b1f142bfe480c24
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 3514.190.7
revision-id: mhammond at skippinet.com.au-20080815004418-2s0jnsyyb7ra6an8
parent: mhammond at skippinet.com.au-20080812130700-05ohg06353nxg22q
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.file_in_use
timestamp: Fri 2008-08-15 10:44:18 +1000
message:
John asked for TestNotApplicable instead of TestSkipped when no os.link.
modified:
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
------------------------------------------------------------
revno: 3514.190.6
revision-id: mhammond at skippinet.com.au-20080812130700-05ohg06353nxg22q
parent: mhammond at skippinet.com.au-20080812130601-x1r70uyerz50h4gd
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.file_in_use
timestamp: Tue 2008-08-12 23:07:00 +1000
message:
eagerly unlock the result_basis to prevent handles staying open.
modified:
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
------------------------------------------------------------
revno: 3514.190.5
revision-id: mhammond at skippinet.com.au-20080812130601-x1r70uyerz50h4gd
parent: mhammond at skippinet.com.au-20080812113721-13deviynbqzwrul7
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.file_in_use
timestamp: Tue 2008-08-12 23:06:01 +1000
message:
ensure merge_modified() closes the hash file.
modified:
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3514.190.4
revision-id: mhammond at skippinet.com.au-20080812113721-13deviynbqzwrul7
parent: mhammond at skippinet.com.au-20080812111212-81vo1v69y1dtachv
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.file_in_use
timestamp: Tue 2008-08-12 21:37:21 +1000
message:
do_merge gets one 'finally' per lock so locks always released on failure.
modified:
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
------------------------------------------------------------
revno: 3514.190.3
revision-id: mhammond at skippinet.com.au-20080812111212-81vo1v69y1dtachv
parent: mhammond at skippinet.com.au-20080812110839-emxho9q2id04wnr2
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.file_in_use
timestamp: Tue 2008-08-12 21:12:12 +1000
message:
ensure we aren't trying to remove the cwd, which fails on Windows.
modified:
bzrlib/tests/blackbox/test_outside_wt.py test_outside_wt.py-20060116200058-98edd33e7db8bdde
------------------------------------------------------------
revno: 3514.190.2
revision-id: mhammond at skippinet.com.au-20080812110839-emxho9q2id04wnr2
parent: mhammond at skippinet.com.au-20080812110800-cib2ht1l27md0sj1
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.file_in_use
timestamp: Tue 2008-08-12 21:08:39 +1000
message:
ensure the conflict list file is closed before returning.
modified:
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3514.190.1
revision-id: mhammond at skippinet.com.au-20080812110800-cib2ht1l27md0sj1
parent: pqm at pqm.ubuntu.com-20080811083307-tbibm26paa3r4hg8
committer: Mark Hammond <mhammond at skippinet.com.au>
branch nick: bzr.work.tests.file_in_use
timestamp: Tue 2008-08-12 21:08:00 +1000
message:
raise TestSkipped if os.link doesn't exist.
modified:
bzrlib/tests/workingtree_implementations/test_workingtree.py test_workingtree.py-20060203003124-817757d3e31444fb
-------------- next part --------------
Diff too large for email (2022 lines, the limit is 1000).
More information about the bazaar-commits
mailing list