At http://bzr.arbash-meinel.com/branches/bzr/1.8-dev/per_tests_239343
------------------------------------------------------------
revno: 3694
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: John Arbash Meinel <[EMAIL PROTECTED]>
branch nick: per_tests_239343
timestamp: Wed 2008-09-10 14:13:43 -0500
message:
Merge bzr.dev, resolve NEWS
added:
doc/developers/overview.txt overview.txt-20080904022501-ww2ggomrs5elxfm0-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzr.ico bzr.ico-20060629083000-q18ip0hk7lq55i4y-1
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
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
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/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_remote.py
test_remote.py-20060720103555-yeeg2x51vn0rbtdp-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/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
------------------------------------------------------------
revno: 3689.1.9
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
branch nick: +trunk
timestamp: Wed 2008-09-10 06:33:34 +0100
message:
(jam) Merge in bzr-1.7rc1, open bzr-1.8 for development.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3689.9.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: John Arbash Meinel <[EMAIL PROTECTED]>
branch nick: jam-integration
timestamp: Tue 2008-09-09 23:54:57 -0500
message:
Merge in bzr 1.7rc1, open 1.8 for development
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py
__init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3689.7.2
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
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: 3689.8.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: John Arbash Meinel <[EMAIL PROTECTED]>
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: 3689.7.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
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: 3689.6.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: John Arbash Meinel <[EMAIL PROTECTED]>
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: 3689.1.8
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
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: 3688.3.3
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
author: Mark Hammond <[EMAIL PROTECTED]>
committer: John Arbash Meinel <[EMAIL PROTECTED]>
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: 3688.3.2
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Mark Hammond <[EMAIL PROTECTED]>
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: 3688.3.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Mark Hammond <[EMAIL PROTECTED]>
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: 3684.2.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Mark Hammond <[EMAIL PROTECTED]>
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: 3689.1.7
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
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: 3689.5.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Bennetts <[EMAIL PROTECTED]>
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: 3689.1.6
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
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: 3689.4.2
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Bennetts <[EMAIL PROTECTED]>
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: 3689.4.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Bennetts <[EMAIL PROTECTED]>
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: 3689.1.5
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
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: 3688.2.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: John Arbash Meinel <[EMAIL PROTECTED]>
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: 3606.5.17
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
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: 3606.16.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: John Arbash Meinel <[EMAIL PROTECTED]>
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: 3689.1.4
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
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: 3689.3.6
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Bennetts <[EMAIL PROTECTED]>
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: 3689.3.5
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Bennetts <[EMAIL PROTECTED]>
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: 3689.3.4
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Bennetts <[EMAIL PROTECTED]>
branch nick: objectnotlocked
timestamp: Fri 2008-09-05 20:21:29 +1000
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3689.3.3
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Bennetts <[EMAIL PROTECTED]>
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: 3689.3.2
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Bennetts <[EMAIL PROTECTED]>
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: 3689.3.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Andrew Bennetts <[EMAIL PROTECTED]>
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: 3689.1.3
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
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: 3689.2.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
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: 3619.6.9
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Mark Hammond <[EMAIL PROTECTED]>
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: 3619.6.8
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Mark Hammond <[EMAIL PROTECTED]>
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: 3619.6.7
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Mark Hammond <[EMAIL PROTECTED]>
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: 3619.6.6
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Mark Hammond <[EMAIL PROTECTED]>
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: 3619.6.5
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Mark Hammond <[EMAIL PROTECTED]>
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: 3619.6.4
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Mark Hammond <[EMAIL PROTECTED]>
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: 3619.6.3
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Mark Hammond <[EMAIL PROTECTED]>
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: 3619.6.2
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Mark Hammond <[EMAIL PROTECTED]>
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: 3619.6.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Mark Hammond <[EMAIL PROTECTED]>
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
------------------------------------------------------------
revno: 3689.1.2
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
branch nick: +trunk
timestamp: Fri 2008-09-05 02:36:04 +0100
message:
Developer docs on review process and stacking
added:
doc/developers/overview.txt
overview.txt-20080904022501-ww2ggomrs5elxfm0-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
------------------------------------------------------------
revno: 3683.1.3
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: doc
timestamp: Fri 2008-09-05 11:00:38 +1000
message:
Update news
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3683.1.2
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: doc
timestamp: Thu 2008-09-04 15:35:16 +1000
message:
Developer documentation of repository stacking
modified:
doc/developers/overview.txt
overview.txt-20080904022501-ww2ggomrs5elxfm0-1
------------------------------------------------------------
revno: 3683.1.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Martin Pool <[EMAIL PROTECTED]>
branch nick: doc
timestamp: Thu 2008-09-04 14:55:36 +1000
message:
Improved review process docs and separate out architectural overview
added:
doc/developers/overview.txt
overview.txt-20080904022501-ww2ggomrs5elxfm0-1
modified:
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt
index.txt-20070508041241-qznziunkg0nffhiw-1
------------------------------------------------------------
revno: 3689.1.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: Canonical.com Patch Queue Manager <[EMAIL PROTECTED]>
branch nick: +trunk
timestamp: Thu 2008-09-04 19:04:41 +0100
message:
(jam) Use list.append(str) instead of list += str when buffering sftp
reads.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
------------------------------------------------------------
revno: 3688.1.2
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: John Arbash Meinel <[EMAIL PROTECTED]>
branch nick: jam-integration
timestamp: Thu 2008-09-04 12:34:12 -0500
message:
NEWS entry for the sftp tweak.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3688.1.1
revision-id: [EMAIL PROTECTED]
parent: [EMAIL PROTECTED]
committer: John Arbash Meinel <[EMAIL PROTECTED]>
branch nick: jam-integration
timestamp: Wed 2008-09-03 21:42:34 -0500
message:
Properly append the data to the list buffer.
Rather than using [] += 'str', use [].append(str).
It turns out both *work*, but the former adds each character
individually to the list.
modified:
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
Diff too large for email (1567 lines, the limit is 1000).
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
