Rev 2858: Merge bzr.dev and export fix. in http://people.ubuntu.com/~robertc/baz2.0/repository
Robert Collins
robertc at robertcollins.net
Sun Oct 28 17:32:58 GMT 2007
At http://people.ubuntu.com/~robertc/baz2.0/repository
------------------------------------------------------------
revno: 2858
revision-id:robertc at robertcollins.net-20071028173245-0jboqn9k9if01wq1
parent: robertc at robertcollins.net-20071025191858-1ptyjzomxhwrmehi
parent: robertc at robertcollins.net-20071028173025-pk3c1b0kmr5x6l31
committer: Robert Collins <robertc at robertcollins.net>
branch nick: repository
timestamp: Mon 2007-10-29 04:32:45 +1100
message:
Merge bzr.dev and export fix.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/export/__init__.py __init__.py-20051114235828-1ba62cb4062304e6
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
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/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
bzrlib/tests/repository_implementations/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/knitpack.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.9.1.10
revision-id:robertc at robertcollins.net-20071028173025-pk3c1b0kmr5x6l31
parent: pqm at pqm.ubuntu.com-20071028093324-h4ymz42l31vwfbu1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: export
timestamp: Mon 2007-10-29 04:30:25 +1100
message:
(robertc) Fix export to lock the repository. (Robert Collins)
modified:
bzrlib/export/__init__.py __init__.py-20051114235828-1ba62cb4062304e6
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.9.1.9
revision-id:pqm at pqm.ubuntu.com-20071028093324-h4ymz42l31vwfbu1
parent: pqm at pqm.ubuntu.com-20071026085609-c3r8skfrmjj21j0m
parent: bialix at ukr.net-20071027163327-eewvj4c629hsg7ti
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2007-10-28 09:33:24 +0000
message:
trivial fix for string formatting in rmtree_temp_dir
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.9.1.8.1.1
revision-id:bialix at ukr.net-20071027163327-eewvj4c629hsg7ti
parent: pqm at pqm.ubuntu.com-20071026085609-c3r8skfrmjj21j0m
committer: Alexander Belchenko <bialix at ukr.net>
branch nick: win32.selftest
timestamp: Sat 2007-10-27 19:33:27 +0300
message:
trivial fix for string formatting in rmtree_temp_dir
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.9.1.8
revision-id:pqm at pqm.ubuntu.com-20071026085609-c3r8skfrmjj21j0m
parent: pqm at pqm.ubuntu.com-20071026074806-v0hw6v1dbm6hu9oj
parent: andrew.bennetts at canonical.com-20071026081256-7py6j5tfe37w2eq2
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-10-26 09:56:09 +0100
message:
Unlock while in a write group now aborts the write group, unlocks, and errors. Also includes the knit extraction one-liner tweak.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
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/repository_implementations/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2849.1.24
revision-id:andrew.bennetts at canonical.com-20071026081256-7py6j5tfe37w2eq2
parent: andrew.bennetts at canonical.com-20071026072544-1c9p65ogzvtb61ay
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: mbp-writegroups
timestamp: Fri 2007-10-26 18:12:56 +1000
message:
Fix test_callCatchWarnings to pass when run with Python 2.4.
modified:
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 2849.1.23
revision-id:andrew.bennetts at canonical.com-20071026072544-1c9p65ogzvtb61ay
parent: andrew.bennetts at canonical.com-20071026063453-4eyjd2b5o391db20
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: mbp-writegroups
timestamp: Fri 2007-10-26 17:25:44 +1000
message:
Override warnings.filters in callCatchWarnings, to insulate it from -Werror.
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2849.1.22
revision-id:andrew.bennetts at canonical.com-20071026063453-4eyjd2b5o391db20
parent: mbp at sourcefrog.net-20071025012451-pvqf4umf0efueoqr
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: mbp-writegroups
timestamp: Fri 2007-10-26 16:34:53 +1000
message:
Commit Martin's faster knit extraction one-liner that was approved by Robert and John.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 2849.1.21
revision-id:mbp at sourcefrog.net-20071025012451-pvqf4umf0efueoqr
parent: mbp at sourcefrog.net-20071024073815-0a1sdilg17ay4qpb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: writegroups
timestamp: Thu 2007-10-25 11:24:51 +1000
message:
unlock while in a write group now aborts the write group, unlocks, and errors.
Also, RemoteRepository.unlock() sends the unlock rpc even if there was an error
unlocking the vfs-based repository.
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
------------------------------------------------------------
revno: 2849.1.20
revision-id:mbp at sourcefrog.net-20071024073815-0a1sdilg17ay4qpb
parent: mbp at sourcefrog.net-20071024073652-ct7z9cseabreb6fc
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: writegroups
timestamp: Wed 2007-10-24 17:38:15 +1000
message:
Rename TestCase._capture_warnings
modified:
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 2849.1.19
revision-id:mbp at sourcefrog.net-20071024073652-ct7z9cseabreb6fc
parent: mbp at sourcefrog.net-20071024055951-6bmkfmgqh2188cij
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: writegroups
timestamp: Wed 2007-10-24 17:36:52 +1000
message:
New method TestCase.call_catch_warnings
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/repository_implementations/test_write_group.py test_write_group.py-20070716105516-89n34xtogq5frn0m-1
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.9.1.7
revision-id:pqm at pqm.ubuntu.com-20071026074806-v0hw6v1dbm6hu9oj
parent: pqm at pqm.ubuntu.com-20071025232834-wcuoh6azwgez5b80
parent: andrew.bennetts at canonical.com-20071026065843-zof5jrpbfic8cmxl
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-10-26 08:48:06 +0100
message:
(Andrew Bennetts) Reconcile will force file versions with unreferenced parents to be stored as fulltexts (fixes bug 155730).
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.6.2.14
revision-id:andrew.bennetts at canonical.com-20071026065843-zof5jrpbfic8cmxl
parent: andrew.bennetts at canonical.com-20071026064809-4f9fi8h5we7ob7wg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-remove-unreferenced-file-versions-bug-155730
timestamp: Fri 2007-10-26 16:58:43 +1000
message:
Tweaks suggested by review.
modified:
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.6.2.13
revision-id:andrew.bennetts at canonical.com-20071026064809-4f9fi8h5we7ob7wg
parent: andrew.bennetts at canonical.com-20071026064728-d3vy41n03fb2j8ni
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-remove-unreferenced-file-versions-bug-155730
timestamp: Fri 2007-10-26 16:48:09 +1000
message:
Display number of file versions not referenced by their corresponding inventory (i.e. dangling versions) in bzr check output.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.6.2.12
revision-id:andrew.bennetts at canonical.com-20071026064728-d3vy41n03fb2j8ni
parent: andrew.bennetts at canonical.com-20071026010910-5ibwby7sfga11llr
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-remove-unreferenced-file-versions-bug-155730
timestamp: Fri 2007-10-26 16:47:28 +1000
message:
Add a mutter as a hack give some basic progress indication in .bzr.log for the prepopulation step.
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.6.2.11
revision-id:andrew.bennetts at canonical.com-20071026010910-5ibwby7sfga11llr
parent: andrew.bennetts at canonical.com-20071025001405-aroz1xo9327ndwnn
parent: pqm at pqm.ubuntu.com-20071025232834-wcuoh6azwgez5b80
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-remove-unreferenced-file-versions-bug-155730
timestamp: Fri 2007-10-26 11:09:10 +1000
message:
Merge from bzr.dev.
added:
bzrlib/plugins/launchpad/account.py account.py-20071011033320-50y6vfftywf4yllw-1
bzrlib/plugins/launchpad/test_account.py test_account.py-20071011033320-50y6vfftywf4yllw-2
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
doc/developers/knitpack.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commit.py commit.py-20050511101309-79ec1a0168e0e825
bzrlib/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
bzrlib/index.py index.py-20070712131115-lolkarso50vjr64s-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/test_register.py test_register.py-20060315182712-40f5dda945c829a8
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/tests/blackbox/test_info.py test_info.py-20060215045507-bbdd2d34efab9e0a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/helpers.py helpers.py-20070924032407-m460yl9j5gu5ju85-2
bzrlib/tests/repository_implementations/test_check.py test_check.py-20070824124512-38g4d135gcqxo4zb-1
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
bzrlib/tests/repository_implementations/test_commit_builder.py test_commit_builder.py-20060606110838-76e3ra5slucqus81-1
bzrlib/tests/repository_implementations/test_fileid_involved.py test_file_involved.py-20051215205901-728a172d1014daaa
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_info.py test_info.py-20070320150933-m0xxm1g7xi9v6noe-1
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/tests/workingtree_implementations/test_unversion.py test_unversion.py-20060907074408-bygh2y28jz8u0cg7-1
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_pycurl.py pycurlhttp.py-20060110060940-4e2a705911af77a6
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/conflicts.txt conflicts.txt-20070723221841-ns3jvwxdb4okn6fk-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.6.2.10
revision-id:andrew.bennetts at canonical.com-20071025001405-aroz1xo9327ndwnn
parent: andrew.bennetts at canonical.com-20071024110815-t89wamuahli15fe4
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-remove-unreferenced-file-versions-bug-155730
timestamp: Thu 2007-10-25 10:14:05 +1000
message:
More docstrings, elaborate a comment with an XXX, and remove a little bit of cruft.
modified:
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.6.2.9
revision-id:andrew.bennetts at canonical.com-20071024110815-t89wamuahli15fe4
parent: andrew.bennetts at canonical.com-20071024110355-x7ikgyc6xrwexko9
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-remove-unreferenced-file-versions-bug-155730
timestamp: Wed 2007-10-24 21:08:15 +1000
message:
Adjust expected 'check' output in test scenarios. All test_check_reconcile now passes.
modified:
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.6.2.8
revision-id:andrew.bennetts at canonical.com-20071024110355-x7ikgyc6xrwexko9
parent: andrew.bennetts at canonical.com-20071024105639-8uskiounrird2i43
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-remove-unreferenced-file-versions-bug-155730
timestamp: Wed 2007-10-24 21:03:55 +1000
message:
Remove totally unreferenced file versions. All reconcile tests passing.
modified:
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.6.2.7
revision-id:andrew.bennetts at canonical.com-20071024105639-8uskiounrird2i43
parent: andrew.bennetts at canonical.com-20071024105224-ro2zlfg1iqvgs9rc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-remove-unreferenced-file-versions-bug-155730
timestamp: Wed 2007-10-24 20:56:39 +1000
message:
Condense assertion message.
modified:
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.6.2.6
revision-id:andrew.bennetts at canonical.com-20071024105224-ro2zlfg1iqvgs9rc
parent: andrew.bennetts at canonical.com-20071024104558-o2rij4yn86abdqh5
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-remove-unreferenced-file-versions-bug-155730
timestamp: Wed 2007-10-24 20:52:24 +1000
message:
Make some more check tests pass.
modified:
bzrlib/check.py check.py-20050309040759-f3a679400c06bcc1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.6.2.5
revision-id:andrew.bennetts at canonical.com-20071024104558-o2rij4yn86abdqh5
parent: andrew.bennetts at canonical.com-20071024104255-c3shrqmiynjqm9n8
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-remove-unreferenced-file-versions-bug-155730
timestamp: Wed 2007-10-24 20:45:58 +1000
message:
Remove corrected_inventories, add proper description of corrected_fulltexts.
modified:
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.6.2.4
revision-id:andrew.bennetts at canonical.com-20071024104255-c3shrqmiynjqm9n8
parent: andrew.bennetts at canonical.com-20071024081257-w4gd9pl4dp1h8xtt
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-remove-unreferenced-file-versions-bug-155730
timestamp: Wed 2007-10-24 20:42:55 +1000
message:
Don't create a 'rev3' file version in the test.
modified:
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.6.2.3
revision-id:andrew.bennetts at canonical.com-20071024081257-w4gd9pl4dp1h8xtt
parent: andrew.bennetts at canonical.com-20071023075622-ikpj0dyoku3y6jsf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-remove-unreferenced-file-versions-bug-155730
timestamp: Wed 2007-10-24 18:12:57 +1000
message:
Add fulltexts to avoid bug 155730.
modified:
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.6.2.2
revision-id:andrew.bennetts at canonical.com-20071023075622-ikpj0dyoku3y6jsf
parent: andrew.bennetts at canonical.com-20071023004829-l76zvyp8sglxtgpa
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-remove-unreferenced-file-versions-bug-155730
timestamp: Tue 2007-10-23 17:56:22 +1000
message:
Only try to check versions that actually exist in the versioned file, and do a little more muttering.
modified:
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.6.2.1
revision-id:andrew.bennetts at canonical.com-20071023004829-l76zvyp8sglxtgpa
parent: pqm at pqm.ubuntu.com-20071022212520-al7xlieh3d7ng370
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: reconcile-remove-unreferenced-file-versions-bug-155730
timestamp: Tue 2007-10-23 10:48:29 +1000
message:
Tidy a scenario's all_versions slightly.
modified:
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.9.1.6
revision-id:pqm at pqm.ubuntu.com-20071025232834-wcuoh6azwgez5b80
parent: pqm at pqm.ubuntu.com-20071025211612-mmsxejad9v1cu5c3
parent: ian.clatworthy at internode.on.net-20071025224428-035yah62rln0fhz5
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2007-10-26 00:28:34 +0100
message:
initial cut of userdoc for knitpack repositories (Ian Clatworthy)
modified:
doc/developers/knitpack.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.9.1.5.1.1
revision-id:ian.clatworthy at internode.on.net-20071025224428-035yah62rln0fhz5
parent: pqm at pqm.ubuntu.com-20071025211612-mmsxejad9v1cu5c3
parent: ian.clatworthy at internode.on.net-20071025224202-fdcohsk9sw2qfvnn
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: ianc-integration
timestamp: Fri 2007-10-26 08:44:28 +1000
message:
initial cut of userdoc for knitpack repositories (Ian Clatworthy)
modified:
doc/developers/knitpack.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.9.1.2.2.3
revision-id:ian.clatworthy at internode.on.net-20071025224202-fdcohsk9sw2qfvnn
parent: ian.clatworthy at internode.on.net-20071025112358-7mn6oazh0bv5fqqi
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.pack-doc
timestamp: Fri 2007-10-26 08:42:02 +1000
message:
more feedback from lifeless
modified:
doc/developers/knitpack.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.9.1.2.2.2
revision-id:ian.clatworthy at internode.on.net-20071025112358-7mn6oazh0bv5fqqi
parent: ian.clatworthy at internode.on.net-20071025104927-1vr2io7wlg1m8qxq
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.pack-doc
timestamp: Thu 2007-10-25 21:23:58 +1000
message:
review feedback from lifeless
modified:
doc/developers/knitpack.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.9.1.2.2.1
revision-id:ian.clatworthy at internode.on.net-20071025104927-1vr2io7wlg1m8qxq
parent: pqm at pqm.ubuntu.com-20071025022746-ftudwmzir8v2lccc
committer: Ian Clatworthy <ian.clatworthy at internode.on.net>
branch nick: bzr.pack-doc
timestamp: Thu 2007-10-25 20:49:27 +1000
message:
initial user doc for KnitPack repositories
modified:
doc/developers/knitpack.txt knitpack.txt-20071023074744-q0g5u8me8gk5zbtb-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.9.1.5
revision-id:pqm at pqm.ubuntu.com-20071025211612-mmsxejad9v1cu5c3
parent: pqm at pqm.ubuntu.com-20071025100509-veed3zxqsmgwdug1
parent: jelmer at samba.org-20071024203850-3f9x8rq4iupamufm
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2007-10-25 22:16:12 +0100
message:
Handle empty inventories in Inventory.copy().
modified:
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
------------------------------------------------------------
revno: 2592.1.25.2.7.1.28.1.6.1.3.1.9.2.1.3.74.1.31.3.18.1.9.1.2.1.12.1.8.1.46.1.18.1.1.2.21.2.10.3.8.2.9.3.1
revision-id:jelmer at samba.org-20071024203850-3f9x8rq4iupamufm
parent: pqm at pqm.ubuntu.com-20071024181951-qqo4r5mqrhr032pf
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: integration
timestamp: Wed 2007-10-24 22:38:50 +0200
message:
Handle empty inventories in Inventory.copy().
modified:
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/tests/inventory_implementations/basics.py basics.py-20070903044446-kdjwbiu1p1zi9phs-1
Diff too large for email (1047 lines, the limit is 1000).
More information about the bazaar-commits
mailing list