Rev 2339: [merge] bzr.dev 2371 in http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/make_locking_cheaper
John Arbash Meinel
john at arbash-meinel.com
Thu Mar 22 19:54:40 GMT 2007
At http://bzr.arbash-meinel.com/branches/bzr/0.15-dev/make_locking_cheaper
------------------------------------------------------------
revno: 2339
revision-id: john at arbash-meinel.com-20070322195430-wi92c7jpx17kiagr
parent: john at arbash-meinel.com-20070322151814-fs1m2j0inf8nu7w0
parent: pqm at pqm.ubuntu.com-20070322152522-228285cac46c0dbc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: make_locking_cheaper
timestamp: Thu 2007-03-22 14:54:30 -0500
message:
[merge] bzr.dev 2371
added:
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/per_lock/ bzrlibtestsper_lock-20070314195914-llb0phfp2laomqb3-1
bzrlib/tests/per_lock/__init__.py __init__.py-20070314201444-u92yjsqrkh2m3qcb-1
bzrlib/tests/per_lock/test_lock.py test_lock.py-20070313190612-mfpoa7t8kvrgrhj2-1
bzrlib/tests/per_lock/test_temporary_write_lock.py test_temporary_write-20070314233412-xp3ocbyvw3woa03w-1
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/workingtree_implementations/test_inv.py test_inv.py-20070311221604-ighlq8tbn5xq0kuo-1
modified:
HACKING HACKING-20050805200004-2a5dc975d870f78c
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/cache_utf8.py cache_utf8.py-20060810004311-x4cph46la06h9azm-1
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/gpg.py gpg.py-20051017065112-8654536d415dacc6
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lock.py lock.py-20050527050856-ec090bb51bc03349
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
bzrlib/merge_directive.py merge_directive.py-20070228184838-ja62280spt1g7f4x-1
bzrlib/option.py option.py-20051014052914-661fb36e76e7362f
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_bound_branches.py test_bound_branches.py-20051109215527-2373188ad566c205
bzrlib/tests/blackbox/test_init.py test_init.py-20060309032856-a292116204d86eb7
bzrlib/tests/blackbox/test_merge_directive.py test_merge_directive-20070302012039-zh7uhy39biairtn0-1
bzrlib/tests/blackbox/test_re_sign.py test_re_sign.py-20060214165921-4d04eba231454693
bzrlib/tests/blackbox/test_shared_repository.py test_shared_repository.py-20060317053531-ed30c0d79325e483
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_tags.py test_tags.py-20070116132048-5h4qak2cm22jlb9e-1
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_cache_utf8.py test_cache_utf8.py-20060810004311-x4cph46la06h9azm-2
bzrlib/tests/test_commit_merge.py test_commit_merge.py-20050920084723-819eeeff77907bc5
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_dirstate.py test_dirstate.py-20060728012006-d6mvoihjb3je9peu-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_inv.py testinv.py-20050722220913-1dc326138d1a5892
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/tests/test_merge_directive.py test_merge_directive-20070228184838-ja62280spt1g7f4x-2
bzrlib/tests/test_options.py testoptions.py-20051014093702-96457cfc86319a8f
bzrlib/tests/test_revisionnamespaces.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_sftp_transport.py testsftp.py-20051027032739-247570325fec7e7e
bzrlib/tests/test_tag.py test_tag.py-20070212110532-91cw79inah2cfozx-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_tree.py test_tree.py-20061215160206-usu7lwcj8aq2n3br-1
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/memory.py memory.py-20051016101338-cd008dbdf69f04fc
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/util/bencode.py bencode.py-20070220044742-sltr28q21w2wzlxi-1
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
tools/win32/bzr.iss.cog bzr.iss.cog-20060622100836-b3yup582rt3y0nvm-5
------------------------------------------------------------
revno: 2334.1.37
merged: pqm at pqm.ubuntu.com-20070322152522-228285cac46c0dbc
parent: pqm at pqm.ubuntu.com-20070321071219-55447700ec71371f
parent: john at arbash-meinel.com-20070322141340-wq5w000eof7tpmgj
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-22 15:25:22 +0000
message:
(Ian Clatworthy) Minor corrections to HACKING.
------------------------------------------------------------
revno: 2334.1.36.1.1
merged: john at arbash-meinel.com-20070322141340-wq5w000eof7tpmgj
parent: pqm at pqm.ubuntu.com-20070321071219-55447700ec71371f
parent: ian.clatworthy at internode.on.net-20070322010207-r8xcwjshipoahmcx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Thu 2007-03-22 09:13:40 -0500
message:
(Ian Clatworthy) Minor corrections to HACKING.
------------------------------------------------------------
revno: 2334.1.36.2.1
merged: ian.clatworthy at internode.on.net-20070322010207-r8xcwjshipoahmcx
parent: pqm at pqm.ubuntu.com-20070321071219-55447700ec71371f
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.dev
timestamp: Thu 2007-03-22 11:02:07 +1000
message:
Minor corrections to HACKING
------------------------------------------------------------
revno: 2334.1.36
merged: pqm at pqm.ubuntu.com-20070321071219-55447700ec71371f
parent: pqm at pqm.ubuntu.com-20070321060530-12465d0010713245
parent: bialix at ukr.net-20070312223326-nf01nnhr04nav3v0
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-21 07:12:19 +0000
message:
(bialix) win32 installer improvements
------------------------------------------------------------
revno: 2321.2.7
merged: bialix at ukr.net-20070312223326-nf01nnhr04nav3v0
parent: bialix at ukr.net-20070311203046-e8jo5ku8xxepti4x
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: installer
timestamp: Tue 2007-03-13 00:33:26 +0200
message:
win32 standalone installer improvements:
* admin privileges is not required for install (but there is some limitations)
* CA certificates bundle automatically packed if needed and found
* Check for MFC71.dll is omitted if paramiko.ctypes version is used
------------------------------------------------------------
revno: 2334.1.35
merged: pqm at pqm.ubuntu.com-20070321060530-12465d0010713245
parent: pqm at pqm.ubuntu.com-20070321044905-ded01a80ab49bdd9
parent: andrew.bennetts at canonical.com-20070316010828-1o6m7ec9n9mtr3lx
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-21 06:05:30 +0000
message:
(Andrew Bennetts) Don't use automatically use psyco just by importing a module. It has the nasty side-effect of breaking pdb.
------------------------------------------------------------
revno: 2334.1.27.1.1
merged: andrew.bennetts at canonical.com-20070316010828-1o6m7ec9n9mtr3lx
parent: pqm at pqm.ubuntu.com-20070315231915-000d2bef502ae12b
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: dont-use-psyco
timestamp: Fri 2007-03-16 12:08:28 +1100
message:
Don't use automatically use psyco just by importing a module. It has the nasty side-effect of breaking pdb.
------------------------------------------------------------
revno: 2334.1.34
merged: pqm at pqm.ubuntu.com-20070321044905-ded01a80ab49bdd9
parent: pqm at pqm.ubuntu.com-20070320223938-97fdc295a1111e36
parent: robertc at robertcollins.net-20070321042802-1bxr1t97046woojb
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-21 04:49:05 +0000
message:
Update NEWS to match bzr 0.15.
------------------------------------------------------------
revno: 2334.1.33.1.1
merged: robertc at robertcollins.net-20070321042802-1bxr1t97046woojb
parent: pqm at pqm.ubuntu.com-20070320223938-97fdc295a1111e36
parent: robertc at robertcollins.net-20070321041435-lyb7a2hxgb1547mj
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2007-03-21 15:28:02 +1100
message:
Update NEWS to match bzr 0.15.
------------------------------------------------------------
revno: 2323.2.4
merged: robertc at robertcollins.net-20070321041435-lyb7a2hxgb1547mj
parent: robertc at robertcollins.net-20070321033137-8tj3jiz2nxqdk7pa
parent: pqm at pqm.ubuntu.com-20070320223938-97fdc295a1111e36
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.15
timestamp: Wed 2007-03-21 15:14:35 +1100
message:
Merge (hopefully the last time) mainline fixes for 0.15.
------------------------------------------------------------
revno: 2323.2.3
merged: robertc at robertcollins.net-20070321033137-8tj3jiz2nxqdk7pa
parent: pqm at pqm.ubuntu.com-20070310024746-9892781e4718edaf
parent: mbp at sourcefrog.net-20070314093338-5y0goexyi5vla7w5
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.15
timestamp: Wed 2007-03-21 14:31:37 +1100
message:
Merge Martins 0.15rc2 release branch.
------------------------------------------------------------
revno: 2334.1.24.2.1
merged: mbp at sourcefrog.net-20070314093338-5y0goexyi5vla7w5
parent: pqm at pqm.ubuntu.com-20070314050855-7241ac88a0577101
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 0.15rc2
timestamp: Wed 2007-03-14 20:33:38 +1100
message:
prepare to release 0.15rc2
------------------------------------------------------------
revno: 2323.2.2
merged: pqm at pqm.ubuntu.com-20070310024746-9892781e4718edaf
parent: pqm at pqm.ubuntu.com-20070307115404-732b59c3532cf919
parent: robertc at robertcollins.net-20070309015201-18fbvytw3qi0fh09
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.15
timestamp: Sat 2007-03-10 02:47:46 +0000
message:
Fix the behaviour of dirstate optimised iter_changes recursing its disk iterator into subtrees inappropriately.
------------------------------------------------------------
revno: 2323.2.1.1.2
merged: robertc at robertcollins.net-20070309015201-18fbvytw3qi0fh09
parent: robertc at robertcollins.net-20070308235512-ubrfi3dy7qb52zz0
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.0.15
timestamp: Fri 2007-03-09 12:52:01 +1100
message:
Fix the behaviour of dirstate optimised iter_changes recursing its disk iterator into subtrees inappropriately.
------------------------------------------------------------
revno: 2323.2.1.1.1
merged: robertc at robertcollins.net-20070308235512-ubrfi3dy7qb52zz0
parent: pqm at pqm.ubuntu.com-20070307115404-732b59c3532cf919
committer: Robert Collins <robertc at robertcollins.net>
branch nick: dirstate.0.15
timestamp: Fri 2007-03-09 10:55:12 +1100
message:
dirstate correctness: allow adding paths present in the basis.
------------------------------------------------------------
revno: 2323.2.1
merged: pqm at pqm.ubuntu.com-20070307115404-732b59c3532cf919
parent: pqm at pqm.ubuntu.com-20070307110538-3026a526f5178b00
parent: robertc at robertcollins.net-20070307113448-75xm18n66vrs31s3
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: 0.15
timestamp: Wed 2007-03-07 11:54:04 +0000
message:
(Robert Collins) Release bzr 0.15 RC 1
------------------------------------------------------------
revno: 2323.3.1
merged: robertc at robertcollins.net-20070307113448-75xm18n66vrs31s3
parent: pqm at pqm.ubuntu.com-20070307110538-3026a526f5178b00
committer: Robert Collins <robertc at robertcollins.net>
branch nick: 0.15
timestamp: Wed 2007-03-07 22:34:48 +1100
message:
(Robert Collins) Release bzr 0.15 RC 1
------------------------------------------------------------
revno: 2334.1.33
merged: pqm at pqm.ubuntu.com-20070320223938-97fdc295a1111e36
parent: pqm at pqm.ubuntu.com-20070320222307-30c846e90ac18c65
parent: john at arbash-meinel.com-20070320215959-1vwhp1nl861bf7ff
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-20 22:39:38 +0000
message:
(John Arbash Meinel) allow win32 to grab a write lock after 'bzr status', so that we can record the updated stat values.
------------------------------------------------------------
revno: 2334.1.29.3.4
merged: john at arbash-meinel.com-20070320215959-1vwhp1nl861bf7ff
parent: john at arbash-meinel.com-20070319221128-iphfdqrrfqypfjva
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: simple_locking
timestamp: Tue 2007-03-20 16:59:59 -0500
message:
NEWS
------------------------------------------------------------
revno: 2334.1.29.3.3
merged: john at arbash-meinel.com-20070319221128-iphfdqrrfqypfjva
parent: john at arbash-meinel.com-20070319214503-1t048spp6n2tbro7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: simple_locking
timestamp: Mon 2007-03-19 17:11:28 -0500
message:
make Write locks not block on Read locks, so that revert tests don't fail
Specifically:
test_revert.TestRevert.test_preserve_execute
test_revert.TestRevert.test_revert_executable
fail if we fail to take a Write lock if we have a Read lock.
------------------------------------------------------------
revno: 2334.1.29.3.2
merged: john at arbash-meinel.com-20070319214503-1t048spp6n2tbro7
parent: john at arbash-meinel.com-20070319205618-21plqrdf0feihonk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: simple_locking
timestamp: Mon 2007-03-19 16:45:03 -0500
message:
Disable read locks blocking on write locks.
This requires some small test updates to disable that sort of check.
But it should allow the rest of the test suite to pass on non-win32
------------------------------------------------------------
revno: 2334.1.29.3.1
merged: john at arbash-meinel.com-20070319205618-21plqrdf0feihonk
parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
parent: john at arbash-meinel.com-20070319204546-xxywya2iuemwqdt9
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: simple_locking
timestamp: Mon 2007-03-19 15:56:18 -0500
message:
[merge] locking changes into bzr.dev tip
------------------------------------------------------------
revno: 2334.1.19.3.8.1.11
merged: john at arbash-meinel.com-20070319204546-xxywya2iuemwqdt9
parent: john at arbash-meinel.com-20070315233905-1keqs8pqeas1smq2
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Mon 2007-03-19 15:45:46 -0500
message:
Remove the unused _ignore_write_lock parameter.
------------------------------------------------------------
revno: 2334.1.19.3.8.1.10
merged: john at arbash-meinel.com-20070315233905-1keqs8pqeas1smq2
parent: john at arbash-meinel.com-20070315232459-tf23624lgm7zz1yj
parent: bialix at ukr.net-20070315232743-ol8q5vyqzpvdkrjy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 18:39:05 -0500
message:
[merge] Alexander Belchenko: forgotten import of TestSkipped
------------------------------------------------------------
revno: 2334.1.19.3.8.1.8.1.1
merged: bialix at ukr.net-20070315232743-ol8q5vyqzpvdkrjy
parent: john at arbash-meinel.com-20070315191520-3ogywmtl6v5gop7q
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: jam-locking-bialix
timestamp: Fri 2007-03-16 01:27:43 +0200
message:
forgotten import of TestSkipped
------------------------------------------------------------
revno: 2334.1.19.3.8.1.9
merged: john at arbash-meinel.com-20070315232459-tf23624lgm7zz1yj
parent: john at arbash-meinel.com-20070315191520-3ogywmtl6v5gop7q
parent: pqm at pqm.ubuntu.com-20070315231915-000d2bef502ae12b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 18:24:59 -0500
message:
[merge] bzr.dev 2359
------------------------------------------------------------
revno: 2334.1.19.3.8.1.8
merged: john at arbash-meinel.com-20070315191520-3ogywmtl6v5gop7q
parent: john at arbash-meinel.com-20070315185559-xtb5q6p8ldl2mvs1
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 13:15:20 -0600
message:
Use the right lock object.
------------------------------------------------------------
revno: 2334.1.19.3.8.1.7
merged: john at arbash-meinel.com-20070315185559-xtb5q6p8ldl2mvs1
parent: john at arbash-meinel.com-20070315181445-8ig26uqlkq8bso3b
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 13:55:59 -0500
message:
Change the temporary_write_lock api, so that it always returns a lock object,
and a flag indicating whether it was able to grab a write lock.
This is because callers don't know whether it had to unlock the original lock, so it
should always return something that lets callers maintain proper state.
------------------------------------------------------------
revno: 2334.1.19.3.8.1.6
merged: john at arbash-meinel.com-20070315181445-8ig26uqlkq8bso3b
parent: john at arbash-meinel.com-20070315180216-jddyle9fxhr8tlde
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 13:14:45 -0500
message:
ctypes locks should return ctypes locks.
------------------------------------------------------------
revno: 2334.1.19.3.8.1.5
merged: john at arbash-meinel.com-20070315180216-jddyle9fxhr8tlde
parent: john at arbash-meinel.com-20070315171948-5m28gvw153egui90
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 13:02:16 -0500
message:
Update DirState to use the new 'temporary_write_lock', and add tests that it works.
------------------------------------------------------------
revno: 2334.1.19.3.8.1.4
merged: john at arbash-meinel.com-20070315171948-5m28gvw153egui90
parent: john at arbash-meinel.com-20070314234034-udg2sm249k9dqj8r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Thu 2007-03-15 12:19:48 -0500
message:
Implement temporary_write_lock, and restore_read_lock for win32 locks.
------------------------------------------------------------
revno: 2334.1.19.3.8.1.3
merged: john at arbash-meinel.com-20070314234034-udg2sm249k9dqj8r
parent: john at arbash-meinel.com-20070314223138-wfmodqhruo0g5l0e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Wed 2007-03-14 18:40:34 -0500
message:
Implement a 'ReadLock.temporary_write_lock()' to upgrade to a write-lock in-process.
Implement it for _fcntl.
This is the api that can be used when we want to update a dirty dirstate
even though we only have a read lock.
On win32, this will actually unlock and re-lock the file. Which is part of
the api description. But we don't have to limit ourselves to the lowest
common denominator on all platforms.
------------------------------------------------------------
revno: 2334.1.19.3.8.1.2
merged: john at arbash-meinel.com-20070314223138-wfmodqhruo0g5l0e
parent: john at arbash-meinel.com-20070313233914-bigtq3yxnmf90d9s
parent: john at arbash-meinel.com-20070314205703-taih3n87g9n4afdv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Wed 2007-03-14 17:31:38 -0500
message:
[merge] LockCleanup changes.
------------------------------------------------------------
revno: 2334.1.19.3.8.1.1
merged: john at arbash-meinel.com-20070313233914-bigtq3yxnmf90d9s
parent: john at arbash-meinel.com-20070313231812-h74g1zz32v12lv6s
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 17:39:14 -0600
message:
(broken) Change fcntl locks to be properly exclusive within the same process.
This exposes the location where we are opening the same WorkingTree in both read and write
mode, which breaks several tests.
------------------------------------------------------------
revno: 2334.1.32
merged: pqm at pqm.ubuntu.com-20070320222307-30c846e90ac18c65
parent: pqm at pqm.ubuntu.com-20070320202100-be028df627bf5697
parent: john at arbash-meinel.com-20070320215406-ral0r0d52fgh513i
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-20 22:23:07 +0000
message:
(John Arbash Meinel) fix bug #93681 by not calling _make_absent for removed entries.
------------------------------------------------------------
revno: 2334.1.29.2.5
merged: john at arbash-meinel.com-20070320215406-ral0r0d52fgh513i
parent: john at arbash-meinel.com-20070320010014-d4qj0b1lyd6mi9ak
parent: pqm at pqm.ubuntu.com-20070320202100-be028df627bf5697
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_93681
timestamp: Tue 2007-03-20 16:54:06 -0500
message:
[merge] bzr.dev 2365
------------------------------------------------------------
revno: 2334.1.29.2.4
merged: john at arbash-meinel.com-20070320010014-d4qj0b1lyd6mi9ak
parent: john at arbash-meinel.com-20070320005543-5z6ez16d02l8b0rb
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_93681
timestamp: Mon 2007-03-19 20:00:14 -0500
message:
NEWS for fixing bug #93681
------------------------------------------------------------
revno: 2334.1.29.2.3
merged: john at arbash-meinel.com-20070320005543-5z6ez16d02l8b0rb
parent: john at arbash-meinel.com-20070320004911-0qajqnddr3rf9r2e
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_93681
timestamp: Mon 2007-03-19 19:55:43 -0500
message:
Just check if the entry is absent before calling _make_absent.
------------------------------------------------------------
revno: 2334.1.29.2.2
merged: john at arbash-meinel.com-20070320004911-0qajqnddr3rf9r2e
parent: john at arbash-meinel.com-20070320004104-mwai9d85fym5n0hf
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_93681
timestamp: Mon 2007-03-19 19:49:11 -0500
message:
Simplify the test even further....
Basically, if you have a file deleted as removed, and then you unversion its directory
it deletes all records in the dirblock, not realizing that some of them might
already be marked as removed.
------------------------------------------------------------
revno: 2334.1.29.2.1
merged: john at arbash-meinel.com-20070320004104-mwai9d85fym5n0hf
parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: dirstate_93681
timestamp: Mon 2007-03-19 19:41:04 -0500
message:
(broken) Add a simplified test which exposes the bug.
------------------------------------------------------------
revno: 2334.1.31
merged: pqm at pqm.ubuntu.com-20070320202100-be028df627bf5697
parent: pqm at pqm.ubuntu.com-20070319072606-0b45228c7ad6e0ae
parent: john at arbash-meinel.com-20070320191916-0qxauqd00dehfrxl
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-20 20:21:00 +0000
message:
(John Arbash Meinel, Wouter van Heyst) Handle ERROR_DIRECTORY on win32 when doing 'bzr status filename'
------------------------------------------------------------
revno: 2334.1.29.1.4
merged: john at arbash-meinel.com-20070320191916-0qxauqd00dehfrxl
parent: john at arbash-meinel.com-20070319232736-qsk1w9068h5sm1as
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_notdir
timestamp: Tue 2007-03-20 14:19:16 -0500
message:
Handle ERROR_DIRECTORY for python 2.5
------------------------------------------------------------
revno: 2334.1.29.1.3
merged: john at arbash-meinel.com-20070319232736-qsk1w9068h5sm1as
parent: john at arbash-meinel.com-20070319232456-oal04x9alxvsbuqu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_notdir
timestamp: Mon 2007-03-19 18:27:36 -0500
message:
NEWS entry for fixing bug #90819
------------------------------------------------------------
revno: 2334.1.29.1.2
merged: john at arbash-meinel.com-20070319232456-oal04x9alxvsbuqu
parent: john at arbash-meinel.com-20070319231030-blqw1ylij3g290gg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_notdir
timestamp: Mon 2007-03-19 18:24:56 -0500
message:
Clean up the error.
------------------------------------------------------------
revno: 2334.1.29.1.1
merged: john at arbash-meinel.com-20070319231030-blqw1ylij3g290gg
parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_notdir
timestamp: Mon 2007-03-19 18:10:30 -0500
message:
Catch Windows ERROR_DIRECTORY when doing os.listdir('file')
------------------------------------------------------------
revno: 2334.1.30
merged: pqm at pqm.ubuntu.com-20070319072606-0b45228c7ad6e0ae
parent: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
parent: aaron.bentley at utoronto.ca-20070319070804-om44daawwxu6vi5c
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-19 07:26:06 +0000
message:
Remove the merge-revert alias
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.3
merged: aaron.bentley at utoronto.ca-20070319070804-om44daawwxu6vi5c
parent: aaron.bentley at utoronto.ca-20070314044345-gdpib8w2b9l3lnt2
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-03-19 03:08:04 -0400
message:
Remove the merge-revert alias
------------------------------------------------------------
revno: 2334.1.29
merged: pqm at pqm.ubuntu.com-20070317015305-7b7562331da9f786
parent: pqm at pqm.ubuntu.com-20070316041759-46f11e09fc48958a
parent: john at arbash-meinel.com-20070317013414-icwdyi00jprl081l
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2007-03-17 01:53:05 +0000
message:
(John Arbash Meinel) Update dirstate._iter_changes to return unicode for all paths (bug #92608)
------------------------------------------------------------
revno: 2334.1.26.1.8
merged: john at arbash-meinel.com-20070317013414-icwdyi00jprl081l
parent: john at arbash-meinel.com-20070316220004-fexy52r1i1ezl30j
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Fri 2007-03-16 20:34:14 -0500
message:
Update the tests to handle when fs is non-unicode.
------------------------------------------------------------
revno: 2334.1.26.1.7
merged: john at arbash-meinel.com-20070316220004-fexy52r1i1ezl30j
parent: john at arbash-meinel.com-20070316191340-pddd21esqtzr35zp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Fri 2007-03-16 16:00:04 -0600
message:
NEWS on fixing bug #92608
------------------------------------------------------------
revno: 2334.1.26.1.6
merged: john at arbash-meinel.com-20070316191340-pddd21esqtzr35zp
parent: john at arbash-meinel.com-20070316165516-ebryccbzw9xv2ohr
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Fri 2007-03-16 14:13:40 -0500
message:
Change utf8_decode_with_None to return what we care about.
Re-use utf8_decode_with_None in the outer loop to avoid decoding in the inner
process_entry
Change the name of the local variable, to make it clear what we are doing.
------------------------------------------------------------
revno: 2334.1.26.1.5
merged: john at arbash-meinel.com-20070316165516-ebryccbzw9xv2ohr
parent: john at arbash-meinel.com-20070315232208-4t93v94kr37ducen
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Fri 2007-03-16 11:55:16 -0500
message:
Split out the unicode tests properly.
------------------------------------------------------------
revno: 2334.1.26.1.4
merged: john at arbash-meinel.com-20070315232208-4t93v94kr37ducen
parent: john at arbash-meinel.com-20070315231020-441uvn2zn3qs2p52
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Thu 2007-03-15 18:22:08 -0500
message:
Clean up of test_compare code.
Change helpers to return locked trees, so we have less copied code.
------------------------------------------------------------
revno: 2334.1.26.1.3
merged: john at arbash-meinel.com-20070315231020-441uvn2zn3qs2p52
parent: john at arbash-meinel.com-20070315223535-d3d4964oe1hc8zhg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Thu 2007-03-15 18:10:20 -0500
message:
Start splitting up the overzealous test into focused tests.
And find the bug in add (I was decoding the wrong parameter)
------------------------------------------------------------
revno: 2334.1.26.1.2
merged: john at arbash-meinel.com-20070315223535-d3d4964oe1hc8zhg
parent: john at arbash-meinel.com-20070315205112-g98xrtulgesi9kdy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Thu 2007-03-15 17:35:35 -0500
message:
Add an overzealous test, for Unicode support of _iter_changes.
For both knowns and unknowns.
And include a basic, if suboptimal, fix.
I would rather defer the decoding until we've determined that we are going to return the tuple.
There is still something broken with added files, but I'll get to that.
------------------------------------------------------------
revno: 2334.1.26.1.1
merged: john at arbash-meinel.com-20070315205112-g98xrtulgesi9kdy
parent: pqm at pqm.ubuntu.com-20070315151245-0d48a831784fc542
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: iter_changes_unicode_unknowns
timestamp: Thu 2007-03-15 15:51:12 -0500
message:
Basic implementation test that makes sure _iter_changes handles unknown files.
------------------------------------------------------------
revno: 2334.1.28
merged: pqm at pqm.ubuntu.com-20070316041759-46f11e09fc48958a
parent: pqm at pqm.ubuntu.com-20070315231915-000d2bef502ae12b
parent: john at arbash-meinel.com-20070315232518-9gawnsky0hshc3jd
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-03-16 04:17:59 +0000
message:
(John Arbash Meinel)(trivial) The proper function name is byref, not by_ref
------------------------------------------------------------
revno: 2334.1.19.3.14
merged: john at arbash-meinel.com-20070315232518-9gawnsky0hshc3jd
parent: john at arbash-meinel.com-20070315192225-eoyky43wxf96pd5v
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lock_cleanup
timestamp: Thu 2007-03-15 18:25:18 -0500
message:
(John Arbash Meinel)(trivial) The proper function name is byref, not by_ref
------------------------------------------------------------
revno: 2334.1.27
merged: pqm at pqm.ubuntu.com-20070315231915-000d2bef502ae12b
parent: pqm at pqm.ubuntu.com-20070315151245-0d48a831784fc542
parent: john at arbash-meinel.com-20070315192225-eoyky43wxf96pd5v
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-15 23:19:15 +0000
message:
(John Arbash Meinel, Alexander Belchenko) some small cleanups for the new lock code.
------------------------------------------------------------
revno: 2334.1.19.3.13
merged: john at arbash-meinel.com-20070315192225-eoyky43wxf96pd5v
parent: john at arbash-meinel.com-20070314231341-itctu2g4nobeexu4
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lock_cleanup
timestamp: Thu 2007-03-15 14:22:25 -0500
message:
Cleanup according to Alexander's review comments.
------------------------------------------------------------
revno: 2334.1.26
merged: pqm at pqm.ubuntu.com-20070315151245-0d48a831784fc542
parent: pqm at pqm.ubuntu.com-20070314155044-47c0c6257a6c6717
parent: john at arbash-meinel.com-20070314231341-itctu2g4nobeexu4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-03-15 15:12:45 +0000
message:
(John Arbash Meinel) Clean up OS locks, and implement per-lock implementation tests.
------------------------------------------------------------
revno: 2334.1.19.3.12
merged: john at arbash-meinel.com-20070314231341-itctu2g4nobeexu4
parent: john at arbash-meinel.com-20070314205703-taih3n87g9n4afdv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lock_cleanup
timestamp: Wed 2007-03-14 18:13:41 -0500
message:
Don't create the alternative lock types unless we are on windows.
------------------------------------------------------------
revno: 2334.1.19.3.11
merged: john at arbash-meinel.com-20070314205703-taih3n87g9n4afdv
parent: john at arbash-meinel.com-20070314204717-htynwogv97fqr22a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lock_cleanup
timestamp: Wed 2007-03-14 15:57:03 -0500
message:
Code cleanup
------------------------------------------------------------
revno: 2334.1.19.3.10
merged: john at arbash-meinel.com-20070314204717-htynwogv97fqr22a
parent: john at arbash-meinel.com-20070314201552-bjtfua57456dviep
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lock_cleanup
timestamp: Wed 2007-03-14 15:47:17 -0500
message:
Cleanup errors, and change ReadOnlyLockError to pass around more details.
------------------------------------------------------------
revno: 2334.1.19.3.9
merged: john at arbash-meinel.com-20070314201552-bjtfua57456dviep
parent: john at arbash-meinel.com-20070313231812-h74g1zz32v12lv6s
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: lock_cleanup
timestamp: Wed 2007-03-14 15:15:52 -0500
message:
Update the lock code and test code so that if more than one
lock implementation is available, they will both be tested.
It is quite a bit of overhead, for a case where we are likely to only have 1
real lock implementation per platform, but hey, for now we have 2.
------------------------------------------------------------
revno: 2334.1.19.3.8
merged: john at arbash-meinel.com-20070313231812-h74g1zz32v12lv6s
parent: john at arbash-meinel.com-20070313231737-ce4jw7n4qnx48izk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 18:18:12 -0500
message:
Fix Copyright in lock.py
------------------------------------------------------------
revno: 2334.1.19.3.7
merged: john at arbash-meinel.com-20070313231737-ce4jw7n4qnx48izk
parent: john at arbash-meinel.com-20070313231151-us9a62z9v7cpqvko
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 18:17:37 -0500
message:
Remove the msvc lock type, since it can no longer be used.
------------------------------------------------------------
revno: 2334.1.19.3.6
merged: john at arbash-meinel.com-20070313231151-us9a62z9v7cpqvko
parent: john at arbash-meinel.com-20070313223538-qdjwtmr5dan31t1z
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 18:11:51 -0500
message:
On Win32 if you have a file opened in read+write mode, you must call seek() when switching
------------------------------------------------------------
revno: 2334.1.19.3.5
merged: john at arbash-meinel.com-20070313223538-qdjwtmr5dan31t1z
parent: john at arbash-meinel.com-20070313202827-kj3wt1uqld9mtprj
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 17:35:38 -0500
message:
Fall back on ctypes to get LockFileEx, because msvcrt.locking()
------------------------------------------------------------
revno: 2334.1.19.3.4
merged: john at arbash-meinel.com-20070313202827-kj3wt1uqld9mtprj
parent: john at arbash-meinel.com-20070313193927-8opc18wbi7ln0gil
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 15:28:27 -0500
message:
Clean up the lock.py code to use less indenting, and conform to better coding practise.
------------------------------------------------------------
revno: 2334.1.19.3.3
merged: john at arbash-meinel.com-20070313193927-8opc18wbi7ln0gil
parent: john at arbash-meinel.com-20070313191557-ouvms9hsnpij9xct
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 13:39:27 -0600
message:
Define an explicit error when trying to grab a write lock on a readonly file.
Add some future tests that ensure write and read locks exclude eachother.
Currently fcntl locks do not exclude.
------------------------------------------------------------
revno: 2334.1.19.3.2
merged: john at arbash-meinel.com-20070313191557-ouvms9hsnpij9xct
parent: john at arbash-meinel.com-20070313191105-dlkexxbr3jvva1rx
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 13:15:57 -0600
message:
Add a tests that multiple write locks raise the right kind of error.
------------------------------------------------------------
revno: 2334.1.19.3.1
merged: john at arbash-meinel.com-20070313191105-dlkexxbr3jvva1rx
parent: pqm at pqm.ubuntu.com-20070313175755-809681c81472204a
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: locking
timestamp: Tue 2007-03-13 13:11:05 -0600
message:
Add some basic locking tests which should currently pass on all platforms.
------------------------------------------------------------
revno: 2334.1.25
merged: pqm at pqm.ubuntu.com-20070314155044-47c0c6257a6c6717
parent: pqm at pqm.ubuntu.com-20070314050855-7241ac88a0577101
parent: abentley at panoramicfeedback.com-20070314152251-vvnis0udqkbv4amx
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-14 15:50:44 +0000
message:
Fixes for merge directives
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.58
merged: abentley at panoramicfeedback.com-20070314152251-vvnis0udqkbv4amx
parent: abentley at panoramicfeedback.com-20070314145434-9zsxjc8t80ktvdrd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective-fixes
timestamp: Wed 2007-03-14 11:22:51 -0400
message:
Clean up NEWS
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.57
merged: abentley at panoramicfeedback.com-20070314145434-9zsxjc8t80ktvdrd
parent: abentley at panoramicfeedback.com-20070314144622-b2jm4ml8t1jbdn6f
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective-fixes
timestamp: Wed 2007-03-14 10:54:34 -0400
message:
Ensure server default works, too
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.56
merged: abentley at panoramicfeedback.com-20070314144622-b2jm4ml8t1jbdn6f
parent: abentley at panoramicfeedback.com-20070314144257-t8v7w2ezvphv9k4t
parent: v.ladeuil+lp at free.fr-20070314103718-zg7lmw9jc584l1xd
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective-fixes
timestamp: Wed 2007-03-14 10:46:22 -0400
message:
Merge fix from Vincent
------------------------------------------------------------
revno: 2334.1.24.1.1
merged: v.ladeuil+lp at free.fr-20070314103718-zg7lmw9jc584l1xd
parent: pqm at pqm.ubuntu.com-20070314050855-7241ac88a0577101
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 92195
timestamp: Wed 2007-03-14 11:37:18 +0100
message:
Fix bug #92195.
* tests/blackbox/test_merge_directive.py:
(TestMergeDirective.prepare_merge_directive): Set smtp_server in
branch config.
(TestMergeDirective.test_mail): Check that the smtp_server is
taken into account.
* builtins.py:
(cmd_merge_directive.run): Provide config smtp_server to
SMTP.connect().
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.55
merged: abentley at panoramicfeedback.com-20070314144257-t8v7w2ezvphv9k4t
parent: abentley at panoramicfeedback.com-20070313165944-pzj5m0xkzjlgnaa2
parent: pqm at pqm.ubuntu.com-20070314050855-7241ac88a0577101
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective-fixes
timestamp: Wed 2007-03-14 10:42:57 -0400
message:
Merge from bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.54
merged: abentley at panoramicfeedback.com-20070313165944-pzj5m0xkzjlgnaa2
parent: abentley at panoramicfeedback.com-20070313161851-b5ixqt362m870bg4
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-13 12:59:44 -0400
message:
Decoded revision ids are utf-8
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.53
merged: abentley at panoramicfeedback.com-20070313161851-b5ixqt362m870bg4
parent: abentley at panoramicfeedback.com-20070312133142-ox3xn8jpns33gqd7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Tue 2007-03-13 12:18:51 -0400
message:
Fix deserialization of merge directives with no patch
------------------------------------------------------------
revno: 2334.1.24
merged: pqm at pqm.ubuntu.com-20070314050855-7241ac88a0577101
parent: pqm at pqm.ubuntu.com-20070314015649-ea459482fb1d053d
parent: aaron.bentley at utoronto.ca-20070314044345-gdpib8w2b9l3lnt2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-14 05:08:55 +0000
message:
Hide dirstate-with-subtree, introduce dirstate-tags
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.2
merged: aaron.bentley at utoronto.ca-20070314044345-gdpib8w2b9l3lnt2
parent: aaron.bentley at utoronto.ca-20070314034240-62xl0izb1dloe30v
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Wed 2007-03-14 00:43:45 -0400
message:
Hide dirstate-with-subtree format
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39.1.1
merged: aaron.bentley at utoronto.ca-20070314034240-62xl0izb1dloe30v
parent: abentley at panoramicfeedback.com-20070313140707-tr2b6emwkekfejlu
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-03-13 23:42:40 -0400
message:
Introduce dirstate-tags format
------------------------------------------------------------
revno: 2334.1.23
merged: pqm at pqm.ubuntu.com-20070314015649-ea459482fb1d053d
parent: pqm at pqm.ubuntu.com-20070313211439-de065881d219e0dd
parent: andrew.bennetts at canonical.com-20070313052712-fjpwxnglz6nlmehu
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2007-03-14 01:56:49 +0000
message:
(Andrew Bennetts) Fix bug in MemoryTransport.rmdir.
------------------------------------------------------------
revno: 2334.1.4.5.1
merged: andrew.bennetts at canonical.com-20070313052712-fjpwxnglz6nlmehu
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: memory-transport-rmdir
timestamp: Tue 2007-03-13 16:27:12 +1100
message:
Fix bug in MemoryTransport.rmdir.
------------------------------------------------------------
revno: 2334.1.22
merged: pqm at pqm.ubuntu.com-20070313211439-de065881d219e0dd
parent: pqm at pqm.ubuntu.com-20070313194443-cb3e725957c95642
parent: bialix at ukr.net-20070313201805-pgocxg341h7156vk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 21:14:39 +0000
message:
(bialix) fixes for selftest on win32
------------------------------------------------------------
revno: 2321.2.4.1.10
merged: bialix at ukr.net-20070313201805-pgocxg341h7156vk
parent: bialix at ukr.net-20070313021617-azd5lv30b23gyu48
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32-0.16
timestamp: Tue 2007-03-13 22:18:05 +0200
message:
Explanation about Python 2.5 and StandardError.message attribute
------------------------------------------------------------
revno: 2321.2.4.1.9
merged: bialix at ukr.net-20070313021617-azd5lv30b23gyu48
parent: bialix at ukr.net-20070313021211-su48tjggdkklec47
parent: pqm at pqm.ubuntu.com-20070312175624-659e53c1fa4f5c0c
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32-0.16
timestamp: Tue 2007-03-13 04:16:17 +0200
message:
merge bzr.dev
------------------------------------------------------------
revno: 2321.2.4.1.8
merged: bialix at ukr.net-20070313021211-su48tjggdkklec47
parent: bialix at ukr.net-20070313020319-jrxdz5hlizbid4wz
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32-0.16
timestamp: Tue 2007-03-13 04:12:11 +0200
message:
Cleanup patch after John's review
------------------------------------------------------------
revno: 2321.2.4.1.7
merged: bialix at ukr.net-20070313020319-jrxdz5hlizbid4wz
parent: bialix at ukr.net-20070310233655-1bdw1r64cytacnfe
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32-0.16
timestamp: Tue 2007-03-13 04:03:19 +0200
message:
fixes for passing test_sftp_transport on win32 (thankyou John)
------------------------------------------------------------
revno: 2321.2.4.1.6
merged: bialix at ukr.net-20070310233655-1bdw1r64cytacnfe
parent: bialix at ukr.net-20070310230145-inyu15nildow8w5z
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Sun 2007-03-11 01:36:55 +0200
message:
LockError produce unprintable exception on Python 2.5 because it try to override StandardError.message attribute
------------------------------------------------------------
revno: 2321.2.4.1.5
merged: bialix at ukr.net-20070310230145-inyu15nildow8w5z
parent: bialix at ukr.net-20070308003318-5shp0t2fetqy5v1z
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Sun 2007-03-11 01:01:45 +0200
message:
TestCase.assertFileEqual: separate open/read file operations
to achieve more precise locating the problems on win32
------------------------------------------------------------
revno: 2321.2.4.1.4
merged: bialix at ukr.net-20070308003318-5shp0t2fetqy5v1z
parent: bialix at ukr.net-20070308002046-cab3assbe0chebdp
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Thu 2007-03-08 02:33:18 +0200
message:
test intertree_implementations: skip tests with symlinks on platforms that don't have symlinks support
------------------------------------------------------------
revno: 2321.2.4.1.3
merged: bialix at ukr.net-20070308002046-cab3assbe0chebdp
parent: bialix at ukr.net-20070308000005-ppaej09riavo7hfh
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Thu 2007-03-08 02:20:46 +0200
message:
test_dirstate: skip tests with symlinks on platforms that don't have symlinks support
------------------------------------------------------------
revno: 2321.2.4.1.2
merged: bialix at ukr.net-20070308000005-ppaej09riavo7hfh
parent: bialix at ukr.net-20070307232852-189cg2khvvwuavyo
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Thu 2007-03-08 02:00:05 +0200
message:
numbered dirs: printErrorList show test number for NUMBERED_DIRS
------------------------------------------------------------
revno: 2321.2.4.1.1
merged: bialix at ukr.net-20070307232852-189cg2khvvwuavyo
parent: bialix at ukr.net-20070307105229-v9wczlhckrql4aae
parent: pqm at pqm.ubuntu.com-20070307110538-3026a526f5178b00
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Thu 2007-03-08 01:28:52 +0200
message:
merge bzr.dev (pre-0.15/pre-0.16). It should be mergeable to both
------------------------------------------------------------
revno: 2334.1.21
merged: pqm at pqm.ubuntu.com-20070313194443-cb3e725957c95642
parent: pqm at pqm.ubuntu.com-20070313192858-49070f0422c58848
parent: john at arbash-meinel.com-20070313181145-k7jczddn8rnnlq5s
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 19:44:43 +0000
message:
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees'
------------------------------------------------------------
revno: 2334.1.19.2.1
merged: john at arbash-meinel.com-20070313181145-k7jczddn8rnnlq5s
parent: pqm at pqm.ubuntu.com-20070313175755-809681c81472204a
parent: larstiq at larstiq.dyndns.org-20070202160551-t5szmmar7gb7zt6l
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Tue 2007-03-13 12:11:45 -0600
message:
(Wouter van Heyst) switch 'bzr init-repo' to default to '--no-trees'
------------------------------------------------------------
revno: 2257.2.2
merged: larstiq at larstiq.dyndns.org-20070202160551-t5szmmar7gb7zt6l
parent: larstiq at larstiq.dyndns.org-20070202122410-pvj8k5lqmdrwpazh
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: treeful-repositories
timestamp: Fri 2007-02-02 17:05:51 +0100
message:
Actually test that `bzr init-repo --{no,}-trees` still works
------------------------------------------------------------
revno: 2257.2.1
merged: larstiq at larstiq.dyndns.org-20070202122410-pvj8k5lqmdrwpazh
parent: pqm at pqm.ubuntu.com-20070202101652-5367171684fe2eec
committer: Wouter van Heyst <larstiq at larstiq.dyndns.org>
branch nick: treeful-repositories
timestamp: Fri 2007-02-02 13:24:10 +0100
message:
Change the ui level default for init-repo to --trees.
------------------------------------------------------------
revno: 2334.1.20
merged: pqm at pqm.ubuntu.com-20070313192858-49070f0422c58848
parent: pqm at pqm.ubuntu.com-20070313175755-809681c81472204a
parent: abentley at panoramicfeedback.com-20070313181158-l11qyxl63pxgf9bk
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 19:28:58 +0000
message:
Add news entry for status --versioned
------------------------------------------------------------
revno: 2334.1.19.1.1
merged: abentley at panoramicfeedback.com-20070313181158-l11qyxl63pxgf9bk
parent: pqm at pqm.ubuntu.com-20070313175755-809681c81472204a
parent: warthog618 at gmail.com-20070313142019-mood3em2yds0yg0e
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's integration
timestamp: Tue 2007-03-13 14:11:58 -0400
message:
Add news entry for status --versioned
------------------------------------------------------------
revno: 2334.1.16.1.1
merged: warthog618 at gmail.com-20070313142019-mood3em2yds0yg0e
parent: pqm at pqm.ubuntu.com-20070313120134-ddd44b75e5a2639c
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Tue 2007-03-13 23:20:19 +0900
message:
Add NEWS entry for status versioned.
------------------------------------------------------------
revno: 2334.1.19
merged: pqm at pqm.ubuntu.com-20070313175755-809681c81472204a
parent: pqm at pqm.ubuntu.com-20070313135340-0314c4d26adf39b1
parent: abentley at panoramicfeedback.com-20070313164523-fgyboparf5iyz6li
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 17:57:55 +0000
message:
Merge autodetects line ending for conflict markers
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.40
merged: abentley at panoramicfeedback.com-20070313164523-fgyboparf5iyz6li
parent: abentley at panoramicfeedback.com-20070313140707-tr2b6emwkekfejlu
parent: pqm at pqm.ubuntu.com-20070313135340-0314c4d26adf39b1
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-03-13 12:45:23 -0400
message:
Merge bzr.dev
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.39
merged: abentley at panoramicfeedback.com-20070313140707-tr2b6emwkekfejlu
parent: abentley at panoramicfeedback.com-20070312195641-ezjnseqwgjtkh0iu
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2007-03-13 10:07:07 -0400
message:
Add news entry
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.38
merged: abentley at panoramicfeedback.com-20070312195641-ezjnseqwgjtkh0iu
parent: aaron.bentley at utoronto.ca-20070311203448-a86mnhetckle18co
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2007-03-12 15:56:41 -0400
message:
merge3 auto-detects line endings for conflict markers
------------------------------------------------------------
revno: 2334.1.18
merged: pqm at pqm.ubuntu.com-20070313135340-0314c4d26adf39b1
parent: pqm at pqm.ubuntu.com-20070313133834-ff8514538f6b02f7
parent: marienz at gentoo.org-20070313010034-1m84wjf97jscdkdg
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 13:53:40 +0000
message:
Properly push tags if push creates a new branch.
------------------------------------------------------------
revno: 2334.1.14.2.1
merged: marienz at gentoo.org-20070313010034-1m84wjf97jscdkdg
parent: pqm at pqm.ubuntu.com-20070312222222-41194ff2fd4e23fe
committer: Marien Zwart <marienz at gentoo.org>
branch nick: push-tags
timestamp: Tue 2007-03-13 02:00:34 +0100
message:
Properly push tags if push creates a new branch.
------------------------------------------------------------
revno: 2334.1.17
merged: pqm at pqm.ubuntu.com-20070313133834-ff8514538f6b02f7
parent: pqm at pqm.ubuntu.com-20070313120134-ddd44b75e5a2639c
parent: john at arbash-meinel.com-20070309211422-uoiy80goncfqwr5j
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 13:38:34 +0000
message:
(John Arbash Meinel) Some small fixes for win32 and dirstate.
------------------------------------------------------------
revno: 2325.3.5
merged: john at arbash-meinel.com-20070309211422-uoiy80goncfqwr5j
parent: john at arbash-meinel.com-20070309005252-4heez38fmg2qsfqy
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Fri 2007-03-09 15:14:22 -0600
message:
is_executable needs a read lock.
------------------------------------------------------------
revno: 2325.3.4
merged: john at arbash-meinel.com-20070309005252-4heez38fmg2qsfqy
parent: john at arbash-meinel.com-20070308235059-bi2pipjkmdf8q4m0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2007-03-08 18:52:52 -0600
message:
Rather than setting the executable bit for every file, properly create the working inventory to include it.
------------------------------------------------------------
revno: 2325.3.3
merged: john at arbash-meinel.com-20070308235059-bi2pipjkmdf8q4m0
parent: john at arbash-meinel.com-20070308215801-pr998i7nfbihrf1w
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2007-03-08 17:50:59 -0600
message:
We need to set 'executability' for all files, because on win32, executability=None => executability=False, not executability=nochange
------------------------------------------------------------
revno: 2325.3.2
merged: john at arbash-meinel.com-20070308215801-pr998i7nfbihrf1w
parent: john at arbash-meinel.com-20070308213236-zt1tp45j9tocyp86
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2007-03-08 15:58:01 -0600
message:
Implement is_executable for WorkingTree4 and win32
------------------------------------------------------------
revno: 2325.3.1
merged: john at arbash-meinel.com-20070308213236-zt1tp45j9tocyp86
parent: pqm at pqm.ubuntu.com-20070307233124-ad2724bf65e09035
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32
timestamp: Thu 2007-03-08 15:32:36 -0600
message:
New helper function for merge, which allows us to re-use the existing workingtree, rather than opening it again.
------------------------------------------------------------
revno: 2334.1.16
merged: pqm at pqm.ubuntu.com-20070313120134-ddd44b75e5a2639c
parent: pqm at pqm.ubuntu.com-20070313055515-823e15af73d49270
parent: warthog618 at gmail.com-20070311134418-nu57arul94zawbj4
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 12:01:34 +0000
message:
Add support for status --versioned
------------------------------------------------------------
revno: 2318.2.4
merged: warthog618 at gmail.com-20070311134418-nu57arul94zawbj4
parent: warthog618 at gmail.com-20070307144900-6bt7twg47zul3w0w
parent: pqm at pqm.ubuntu.com-20070310232535-dd964b3ad4a93236
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Sun 2007-03-11 22:44:18 +0900
message:
merge bzr.dev
------------------------------------------------------------
revno: 2318.2.3
merged: warthog618 at gmail.com-20070307144900-6bt7twg47zul3w0w
parent: warthog618 at gmail.com-20070306083736-mldnhakkcj4c8m83
parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Wed 2007-03-07 23:49:00 +0900
message:
merged bzr.dev
------------------------------------------------------------
revno: 2318.2.2
merged: warthog618 at gmail.com-20070306083736-mldnhakkcj4c8m83
parent: warthog618 at gmail.com-20070306083700-u0uciru4ll57ib08
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Tue 2007-03-06 17:37:36 +0900
message:
Apply bug 86451 patch
------------------------------------------------------------
revno: 2318.2.1
merged: warthog618 at gmail.com-20070306083700-u0uciru4ll57ib08
parent: pqm at pqm.ubuntu.com-20070306003758-f693dc70e8b3706b
committer: Kent Gibson <warthog618 at gmail.com>
branch nick: bzr.kg
timestamp: Tue 2007-03-06 17:37:00 +0900
message:
Apply status versioned patch
------------------------------------------------------------
revno: 2334.1.15
merged: pqm at pqm.ubuntu.com-20070313055515-823e15af73d49270
parent: pqm at pqm.ubuntu.com-20070312222222-41194ff2fd4e23fe
parent: mbp at sourcefrog.net-20070313025837-ob25gqj83tyemwj2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2007-03-13 05:55:15 +0000
message:
(marienz,r=john,r=mbp) fix error committing merge with symlinks in dirstate
------------------------------------------------------------
revno: 2334.1.14.1.2
merged: mbp at sourcefrog.net-20070313025837-ob25gqj83tyemwj2
parent: mbp at sourcefrog.net-20070313025747-k6ifccbdvba2l12o
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mz.symlinks
timestamp: Tue 2007-03-13 13:58:37 +1100
message:
update news
------------------------------------------------------------
revno: 2334.1.14.1.1
merged: mbp at sourcefrog.net-20070313025747-k6ifccbdvba2l12o
parent: pqm at pqm.ubuntu.com-20070312222222-41194ff2fd4e23fe
parent: marienz at gentoo.org-20070312205523-gl34xzw1eg0ji28x
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: mz.symlinks
timestamp: Tue 2007-03-13 13:57:47 +1100
message:
(marienz) fixes for error committing merge with symlinks in dirstate
------------------------------------------------------------
revno: 2334.1.4.4.10
merged: marienz at gentoo.org-20070312205523-gl34xzw1eg0ji28x
parent: marienz at gentoo.org-20070312033112-q8h6b0wwzc7ew4d8
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 21:55:23 +0100
message:
Make a test skipped from setUp run tearDown again. Make calling _runCleanups twice safe. Clean up tests.
------------------------------------------------------------
revno: 2334.1.4.4.9
merged: marienz at gentoo.org-20070312033112-q8h6b0wwzc7ew4d8
parent: marienz at gentoo.org-20070312033007-47ci7w0fehb5gqq2
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 04:31:12 +0100
message:
More tests for symlinks in tree inventories.
------------------------------------------------------------
revno: 2334.1.4.4.8
merged: marienz at gentoo.org-20070312033007-47ci7w0fehb5gqq2
parent: marienz at gentoo.org-20070312023543-2ue1egax0wbvl87s
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 04:30:07 +0100
message:
Fix a bug in selftest causing tearDown to run twice for skipped tests.
------------------------------------------------------------
revno: 2334.1.4.4.7
merged: marienz at gentoo.org-20070312023543-2ue1egax0wbvl87s
parent: marienz at gentoo.org-20070312023523-h4bhx3oyqmbd27tf
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 03:35:43 +0100
message:
Remove dead code.
------------------------------------------------------------
revno: 2334.1.4.4.6
merged: marienz at gentoo.org-20070312023523-h4bhx3oyqmbd27tf
parent: marienz at gentoo.org-20070312010216-j6u0y6v75nk071me
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 03:35:23 +0100
message:
Move some tests that do not need a working tree from workingtree_implementations to tree_implementations.
------------------------------------------------------------
revno: 2334.1.4.4.5
merged: marienz at gentoo.org-20070312010216-j6u0y6v75nk071me
parent: marienz at gentoo.org-20070312003752-luxbjn7ty2mr3pyj
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 02:02:16 +0100
message:
Make an assert actually assert something.
------------------------------------------------------------
revno: 2334.1.4.4.4
merged: marienz at gentoo.org-20070312003752-luxbjn7ty2mr3pyj
parent: marienz at gentoo.org-20070311232335-wpymm3pagwdtasjn
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 01:37:52 +0100
message:
Increase test coverage.
------------------------------------------------------------
revno: 2334.1.4.4.3
merged: marienz at gentoo.org-20070311232335-wpymm3pagwdtasjn
parent: marienz at gentoo.org-20070311230549-rn7jh354jrzq6m1e
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 00:23:35 +0100
message:
Make the workingtree inventory tests actually use the different workingtree implementations.
------------------------------------------------------------
revno: 2334.1.4.4.2
merged: marienz at gentoo.org-20070311230549-rn7jh354jrzq6m1e
parent: marienz at gentoo.org-20070311221559-mvb05lew4yyogh5y
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Mon 2007-03-12 00:05:49 +0100
message:
Move the workingtree-related inventory tests to a separate file.
------------------------------------------------------------
revno: 2334.1.4.4.1
merged: marienz at gentoo.org-20070311221559-mvb05lew4yyogh5y
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-dirstate-symlinks
timestamp: Sun 2007-03-11 23:15:59 +0100
message:
Fix committing merges in a dirstate tree with a symlink.
------------------------------------------------------------
revno: 2334.1.14
merged: pqm at pqm.ubuntu.com-20070312222222-41194ff2fd4e23fe
parent: pqm at pqm.ubuntu.com-20070312212825-f3cc39efba5d38f8
parent: john at arbash-meinel.com-20070312215713-sg04g24khpu222l8
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 22:22:22 +0000
message:
(John Whitley) Print out the location of ~/.bazaar as part of 'bzr --version'
------------------------------------------------------------
revno: 2334.1.13.1.1
merged: john at arbash-meinel.com-20070312215713-sg04g24khpu222l8
parent: pqm at pqm.ubuntu.com-20070312212825-f3cc39efba5d38f8
parent: whitley at bangpath.org-20070312060419-e5dsbp3093f3razu
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 16:57:13 -0500
message:
(John Whitley) Print out the location of ~/.bazaar as part of 'bzr --version'
------------------------------------------------------------
revno: 2324.3.3
merged: whitley at bangpath.org-20070312060419-e5dsbp3093f3razu
parent: whitley at bangpath.org-20070312060237-sdfcipif2mxckp2j
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: John Whitley <whitley at bangpath.org>
branch nick: bug-90467
timestamp: Sun 2007-03-11 23:04:19 -0700
message:
Merged bzr.dev
------------------------------------------------------------
revno: 2324.3.2
merged: whitley at bangpath.org-20070312060237-sdfcipif2mxckp2j
parent: whitley at bangpath.org-20070308011749-jn2gand2rpkwqjhn
committer: John Whitley <whitley at bangpath.org>
branch nick: bug-90467
timestamp: Sun 2007-03-11 23:02:37 -0700
message:
Added blackbox test for bzr version.
------------------------------------------------------------
revno: 2324.3.1
merged: whitley at bangpath.org-20070308011749-jn2gand2rpkwqjhn
parent: pqm at pqm.ubuntu.com-20070307121852-b60a661123a5063d
committer: John Whitley <whitley at bangpath.org>
branch nick: bug-90467
timestamp: Wed 2007-03-07 17:17:49 -0800
message:
Reveal location of .bazaar directory in 'bzr version'
------------------------------------------------------------
revno: 2334.1.13
merged: pqm at pqm.ubuntu.com-20070312212825-f3cc39efba5d38f8
parent: pqm at pqm.ubuntu.com-20070312175624-659e53c1fa4f5c0c
parent: john at arbash-meinel.com-20070312203744-uxmg8gk0tl9w5dy6
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 21:28:25 +0000
message:
NEWS fixes for post 0.15-rc1
------------------------------------------------------------
revno: 2334.1.10.1.4
merged: john at arbash-meinel.com-20070312203744-uxmg8gk0tl9w5dy6
parent: john at arbash-meinel.com-20070312203240-yv505vqi4x1ui1vn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 15:37:44 -0500
message:
NEWS for fixing bug #88842
------------------------------------------------------------
revno: 2334.1.10.1.3
merged: john at arbash-meinel.com-20070312203240-yv505vqi4x1ui1vn
parent: john at arbash-meinel.com-20070312202959-13znkfotwveqmm4r
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 15:32:40 -0500
message:
NEWS for fixing bug #90501
------------------------------------------------------------
revno: 2334.1.10.1.2
merged: john at arbash-meinel.com-20070312202959-13znkfotwveqmm4r
parent: john at arbash-meinel.com-20070312173106-d0pbq1cct4sv55vp
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 15:29:59 -0500
message:
Clean up NEWS to fix what actually came after 0.15-rc1 was released.
------------------------------------------------------------
revno: 2334.1.12
merged: pqm at pqm.ubuntu.com-20070312175624-659e53c1fa4f5c0c
parent: pqm at pqm.ubuntu.com-20070312173053-4cdb4cd14190d29e
parent: john at arbash-meinel.com-20070312173106-d0pbq1cct4sv55vp
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 17:56:24 +0000
message:
(Dmitry Vasiliev) Fix typo in 'bzr help selftest'
------------------------------------------------------------
revno: 2334.1.10.1.1
merged: john at arbash-meinel.com-20070312173106-d0pbq1cct4sv55vp
parent: pqm at pqm.ubuntu.com-20070312171624-360d208955511d66
parent: dima at hlabs.spb.ru-20070311111332-8dc0ujrbgfhm1h9d
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 11:31:06 -0600
message:
(Dmitry Vasiliev) Fix typo in 'bzr help selftest'
------------------------------------------------------------
revno: 2333.1.1
merged: dima at hlabs.spb.ru-20070311111332-8dc0ujrbgfhm1h9d
parent: pqm at pqm.ubuntu.com-20070310212110-7853e75061cf66d6
committer: Dmitry Vasiliev <dima at hlabs.spb.ru>
branch nick: small.fixes
timestamp: Sun 2007-03-11 14:13:32 +0300
message:
Fixed typo and removed some trailing whitespaces
------------------------------------------------------------
revno: 2334.1.11
merged: pqm at pqm.ubuntu.com-20070312173053-4cdb4cd14190d29e
parent: pqm at pqm.ubuntu.com-20070312171624-360d208955511d66
parent: abentley at panoramicfeedback.com-20070312160852-tap1mfd79v18kccy
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 17:30:53 +0000
message:
Hide nested-tree commands and improve their docs
------------------------------------------------------------
revno: 2334.1.4.3.1
merged: abentley at panoramicfeedback.com-20070312160852-tap1mfd79v18kccy
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: hide-nested
timestamp: Mon 2007-03-12 12:08:52 -0400
message:
Hide nested-tree commands and improve their docs
------------------------------------------------------------
revno: 2334.1.10
merged: pqm at pqm.ubuntu.com-20070312171624-360d208955511d66
parent: pqm at pqm.ubuntu.com-20070312170144-be4e29ded595dd0a
parent: aaron.bentley at utoronto.ca-20070311203448-a86mnhetckle18co
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 17:16:24 +0000
message:
Fix TT._iter_changes bug with kind=None
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.37
merged: aaron.bentley at utoronto.ca-20070311203448-a86mnhetckle18co
parent: aaron.bentley at utoronto.ca-20070311203045-ok1mva0myxd1aetu
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2007-03-11 16:34:48 -0400
message:
recommit of TreeTransform._iter_changes fix with missing files
------------------------------------------------------------
revno: 2334.1.9
merged: pqm at pqm.ubuntu.com-20070312170144-be4e29ded595dd0a
parent: pqm at pqm.ubuntu.com-20070312164621-d96558dc43d9c1b6
parent: john at arbash-meinel.com-20070312162947-y3a3fjf0iwalwot5
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 17:01:44 +0000
message:
(Marien Zwart) RevisionSpec.from_string() should support Unicode parameters. (especially for revid:)
------------------------------------------------------------
revno: 2334.1.6.1.1
merged: john at arbash-meinel.com-20070312162947-y3a3fjf0iwalwot5
parent: pqm at pqm.ubuntu.com-20070312161518-2706316ad769b56a
parent: marienz at gentoo.org-20070311181444-9p0nwvaljp1h42xh
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 10:29:47 -0600
message:
(Marien Zwart) RevisionSpec.from_string() should support Unicode parameters. (especially for revid:)
------------------------------------------------------------
revno: 2325.2.5
merged: marienz at gentoo.org-20070311181444-9p0nwvaljp1h42xh
parent: marienz at gentoo.org-20070309042901-n5sben4mqbf6iwgj
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Sun 2007-03-11 19:14:44 +0100
message:
Call osutils.safe_revision_id instead of duplicating it.
------------------------------------------------------------
revno: 2325.2.4
merged: marienz at gentoo.org-20070309042901-n5sben4mqbf6iwgj
parent: marienz at gentoo.org-20070309042706-173aok1s5f30rcuj
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Fri 2007-03-09 05:29:01 +0100
message:
Rename rev_id to revision_id because HACKING says so.
------------------------------------------------------------
revno: 2325.2.3
merged: marienz at gentoo.org-20070309042706-173aok1s5f30rcuj
parent: marienz at gentoo.org-20070308185109-wdlc2839v8qcuqhc
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Fri 2007-03-09 05:27:06 +0100
message:
Make the revid RevisionSpec also support utf8-encoded bytestrings.
------------------------------------------------------------
revno: 2325.2.2
merged: marienz at gentoo.org-20070308185109-wdlc2839v8qcuqhc
parent: marienz at gentoo.org-20070308171357-7u3cn4ra7m2zhw0w
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Thu 2007-03-08 19:51:09 +0100
message:
Make the revid RevisionSpec always return a str object, not a unicode object.
------------------------------------------------------------
revno: 2325.2.1
merged: marienz at gentoo.org-20070308171357-7u3cn4ra7m2zhw0w
parent: pqm at pqm.ubuntu.com-20070307233124-ad2724bf65e09035
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr.dev
timestamp: Thu 2007-03-08 18:13:57 +0100
message:
Make the test suite failure reporting a bit more robust.
------------------------------------------------------------
revno: 2334.1.8
merged: pqm at pqm.ubuntu.com-20070312164621-d96558dc43d9c1b6
parent: pqm at pqm.ubuntu.com-20070312163121-a8078e3704c91ffe
parent: abentley at panoramicfeedback.com-20070312133142-ox3xn8jpns33gqd7
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 16:46:21 +0000
message:
Small tweaks for merge directives
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.52
merged: abentley at panoramicfeedback.com-20070312133142-ox3xn8jpns33gqd7
parent: aaron.bentley at utoronto.ca-20070311161600-hvtsmkf3d2z72562
committer: Aaron Bentley <abentley at panoramicfeedback.com>
branch nick: mergedirective
timestamp: Mon 2007-03-12 09:31:42 -0400
message:
speling fix
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.51
merged: aaron.bentley at utoronto.ca-20070311161600-hvtsmkf3d2z72562
parent: aaron.bentley at utoronto.ca-20070311012251-pf1lg4uhb5s4qs3n
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sun 2007-03-11 12:16:00 -0400
message:
Allow leading junk before merge directive header
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.50
merged: aaron.bentley at utoronto.ca-20070311012251-pf1lg4uhb5s4qs3n
parent: aaron.bentley at utoronto.ca-20070311004707-nvgm18l7xx9md7hg
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sat 2007-03-10 20:22:51 -0500
message:
Use public location of submit branch if possible
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.21.1.49
merged: aaron.bentley at utoronto.ca-20070311004707-nvgm18l7xx9md7hg
parent: abentley at panoramicfeedback.com-20070309224147-m7or85t0o86c0t34
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: mergedirective
timestamp: Sat 2007-03-10 19:47:07 -0500
message:
Proper error when deserializing junk
------------------------------------------------------------
revno: 2334.1.7
merged: pqm at pqm.ubuntu.com-20070312163121-a8078e3704c91ffe
parent: pqm at pqm.ubuntu.com-20070312161518-2706316ad769b56a
parent: john at arbash-meinel.com-20070309221739-ociisv9twj9t4ch2
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 16:31:21 +0000
message:
(John Arbash Meinel) raise more helpful errors when detecting Knit corruption.
------------------------------------------------------------
revno: 2329.1.2
merged: john at arbash-meinel.com-20070309221739-ociisv9twj9t4ch2
parent: john at arbash-meinel.com-20070309221455-xh1sb3i6v07a7mak
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_corrupt
timestamp: Fri 2007-03-09 16:17:39 -0600
message:
Remove some spurious whitespace changes.
------------------------------------------------------------
revno: 2329.1.1
merged: john at arbash-meinel.com-20070309221455-xh1sb3i6v07a7mak
parent: pqm at pqm.ubuntu.com-20070309212715-07aacbc78b3e2dc0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: knit_corrupt
timestamp: Fri 2007-03-09 16:14:55 -0600
message:
Update _KnitData parser to raise more helpful errors when it detects corruption.
------------------------------------------------------------
revno: 2334.1.6
merged: pqm at pqm.ubuntu.com-20070312161518-2706316ad769b56a
parent: pqm at pqm.ubuntu.com-20070312154217-b0cd137fae2a67d8
parent: john at arbash-meinel.com-20070312155604-ce341jry03f4w58m
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 16:15:18 +0000
message:
(Marien Zwart) Override smtplib.connect so we don't require smtpd to be running.
------------------------------------------------------------
revno: 2334.1.5.1.1
merged: john at arbash-meinel.com-20070312155604-ce341jry03f4w58m
parent: pqm at pqm.ubuntu.com-20070312154217-b0cd137fae2a67d8
parent: marienz at gentoo.org-20070312034818-vxuaptp67gfiv8ym
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 09:56:04 -0600
message:
(Marien Zwart) Override smtplib.connect so we don't require smtpd to be running.
------------------------------------------------------------
revno: 2334.1.4.2.1
merged: marienz at gentoo.org-20070312034818-vxuaptp67gfiv8ym
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: Marien Zwart <marienz at gentoo.org>
branch nick: bzr-mail-test
timestamp: Mon 2007-03-12 04:48:18 +0100
message:
Make the merge directive tests work if there is no smtpd running on localhost.
------------------------------------------------------------
revno: 2334.1.5
merged: pqm at pqm.ubuntu.com-20070312154217-b0cd137fae2a67d8
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
parent: john at arbash-meinel.com-20070312151404-1midj71kyca44q3p
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2007-03-12 15:42:17 +0000
message:
(Arnaud Fontaine) Compatibility with vsftpd error messages.
------------------------------------------------------------
revno: 2334.1.4.1.1
merged: john at arbash-meinel.com-20070312151404-1midj71kyca44q3p
parent: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: jam-integration
timestamp: Mon 2007-03-12 09:14:04 -0600
message:
(Arnaud Fontaine) Compatibility with vsftpd error messages.
------------------------------------------------------------
revno: 2334.1.4
merged: pqm at pqm.ubuntu.com-20070311211206-0fd0176ac1e77ef7
parent: pqm at pqm.ubuntu.com-20070311205710-9d93fca9fc40d2d0
parent: bialix at ukr.net-20070311203046-e8jo5ku8xxepti4x
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-03-11 21:12:06 +0000
message:
(bialix) 0.15 NEWS cleanup
------------------------------------------------------------
revno: 2321.2.6
merged: bialix at ukr.net-20070311203046-e8jo5ku8xxepti4x
parent: bialix at ukr.net-20070311193937-nx38jief5kw8pp2f
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: mergeable
timestamp: Sun 2007-03-11 22:30:46 +0200
message:
0.15 NEWS cleanup
------------------------------------------------------------
revno: 2334.1.3
merged: pqm at pqm.ubuntu.com-20070311205710-9d93fca9fc40d2d0
parent: pqm at pqm.ubuntu.com-20070311204222-85d0ff7fb929ca45
parent: aaron.bentley at utoronto.ca-20070311203045-ok1mva0myxd1aetu
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-03-11 20:57:10 +0000
message:
Introduce submit: revision spec
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.36
merged: aaron.bentley at utoronto.ca-20070311203045-ok1mva0myxd1aetu
parent: aaron.bentley at utoronto.ca-20070311202539-70agtar0cxuwn0hw
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2007-03-11 16:30:45 -0400
message:
Add NEWS entry
------------------------------------------------------------
revno: 2334.1.2
merged: pqm at pqm.ubuntu.com-20070311204222-85d0ff7fb929ca45
parent: pqm at pqm.ubuntu.com-20070311202133-5b31ae3c82b0e7df
parent: aaron.bentley at utoronto.ca-20070311202539-70agtar0cxuwn0hw
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-03-11 20:42:22 +0000
message:
Introduce submit: revision spec
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.35
merged: aaron.bentley at utoronto.ca-20070311202539-70agtar0cxuwn0hw
parent: aaron.bentley at utoronto.ca-20070311201057-txp1dhe6rg2pts4p
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2007-03-11 16:25:39 -0400
message:
Add note about which branch is selected by submit:
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.34
merged: aaron.bentley at utoronto.ca-20070311201057-txp1dhe6rg2pts4p
parent: aaron.bentley at utoronto.ca-20070311200834-qvh6yomzkv044yof
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2007-03-11 16:10:57 -0400
message:
Fix tag: help
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.33
merged: aaron.bentley at utoronto.ca-20070311200834-qvh6yomzkv044yof
parent: aaron.bentley at utoronto.ca-20070311045313-oq12p1clr0i4042y
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2007-03-11 16:08:34 -0400
message:
Updates from review
------------------------------------------------------------
revno: 1551.2.49.1.40.1.22.1.42.1.31.1.32
merged: aaron.bentley at utoronto.ca-20070311045313-oq12p1clr0i4042y
parent: aaron.bentley at utoronto.ca-20070310213907-ojai90fhn1rpc9vp
parent: pqm at pqm.ubuntu.com-20070310232535-dd964b3ad4a93236
committer: Aaron Bentley <aaron.bentley at utoronto.ca>
branch nick: Aaron's mergeable stuff
timestamp: Sat 2007-03-10 23:53:13 -0500
message:
Add submit: specifier, for merge-directive-like diffs
------------------------------------------------------------
revno: 2334.1.1
merged: pqm at pqm.ubuntu.com-20070311202133-5b31ae3c82b0e7df
parent: pqm at pqm.ubuntu.com-20070310232535-dd964b3ad4a93236
parent: bialix at ukr.net-20070311193937-nx38jief5kw8pp2f
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-03-11 20:21:33 +0000
message:
(bialix,r=aaron,r=john) fixes for selftest on win32
------------------------------------------------------------
revno: 2321.2.5
merged: bialix at ukr.net-20070311193937-nx38jief5kw8pp2f
parent: bialix at ukr.net-20070307105229-v9wczlhckrql4aae
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: mergeable
timestamp: Sun 2007-03-11 21:39:37 +0200
message:
external diff: no need for special code path for win32 (suggested by John Meinel)
------------------------------------------------------------
revno: 2321.2.4
merged: bialix at ukr.net-20070307105229-v9wczlhckrql4aae
parent: bialix at ukr.net-20070307015413-tqium0k9i1oulc6p
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Wed 2007-03-07 12:52:29 +0200
message:
numbered dirs: default value for function args is None to prevent changing NUMBERED_DIRS during selftesting
------------------------------------------------------------
revno: 2321.2.3
merged: bialix at ukr.net-20070307015413-tqium0k9i1oulc6p
parent: bialix at ukr.net-20070307005740-bjpjks1bgk8efuo0
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Wed 2007-03-07 03:54:13 +0200
message:
fix for check_repo_format_for_funky_id_on_win32 after Martin's refactoring of repository format
------------------------------------------------------------
revno: 2321.2.2
merged: bialix at ukr.net-20070307005740-bjpjks1bgk8efuo0
parent: bialix at ukr.net-20070306230900-mbyylf39npkof72m
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: selftest.win32
timestamp: Wed 2007-03-07 02:57:40 +0200
message:
win32 fixes for test_external_diff_binary (gettext on win32 rely on $LANGUAGE)
-------------- next part --------------
Diff too large for email (5277 lines, the limit is 1000).
More information about the bazaar-commits
mailing list