Rev 3341: merge bzr.dev and review fixes in file:///v/home/vila/src/bzr/experimental/faster-selftest/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Mon Apr 28 10:20:37 BST 2008
At file:///v/home/vila/src/bzr/experimental/faster-selftest/
------------------------------------------------------------
revno: 3341
revision-id: v.ladeuil+lp at free.fr-20080428092027-9aqt6qjvtuvxf5uu
parent: v.ladeuil+lp at free.fr-20080423204751-ck6m619a30ivap0x
parent: v.ladeuil+lp at free.fr-20080428085745-bxrf007hjbqfwup5
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: selftest-starts-with
timestamp: Mon 2008-04-28 11:20:27 +0200
message:
merge bzr.dev and review fixes
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/doc/__init__.py __init__.py-20051224020731-eb3eb3ef5b4570df
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
bzrlib/tests/per_lock/__init__.py __init__.py-20070314201444-u92yjsqrkh2m3qcb-1
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
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/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
------------------------------------------------------------
revno: 3338.1.2
revision-id: v.ladeuil+lp at free.fr-20080428085745-bxrf007hjbqfwup5
parent: v.ladeuil+lp at free.fr-20080428075923-01y4bwj484glvqk7
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanup-test-suite-loading
timestamp: Mon 2008-04-28 10:57:45 +0200
message:
Fixed as per Ian's review.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/doc/__init__.py __init__.py-20051224020731-eb3eb3ef5b4570df
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/tests/blackbox/__init__.py __init__.py-20051128053524-eba30d8255e08dc3
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/commands/__init__.py __init__.py-20070520095518-ecfl8531fxgjeycj-1
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/inventory_implementations/__init__.py __init__.py-20070821044532-olbadbokgv3qv1yd-1
bzrlib/tests/per_lock/__init__.py __init__.py-20070314201444-u92yjsqrkh2m3qcb-1
bzrlib/tests/repository_implementations/__init__.py __init__.py-20060131092037-9564957a7d4a841b
bzrlib/tests/revisionstore_implementations/__init__.py __init__.py-20060303020702-976c4186a0f99edb
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/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
------------------------------------------------------------
revno: 3338.1.1
revision-id: v.ladeuil+lp at free.fr-20080428075923-01y4bwj484glvqk7
parent: v.ladeuil+lp at free.fr-20080423135033-nhnu9u2re6m1c2xw
parent: pqm at pqm.ubuntu.com-20080428055446-p0m8jwv1jzegn933
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanup-test-suite-loading
timestamp: Mon 2008-04-28 09:59:23 +0200
message:
merge bzr.dev
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
------------------------------------------------------------
revno: 3302.3.83
revision-id: pqm at pqm.ubuntu.com-20080428055446-p0m8jwv1jzegn933
parent: pqm at pqm.ubuntu.com-20080428032913-4fgik9du2kpxl8sf
parent: mbp at sourcefrog.net-20080428035209-2sfjlaeijx20wt1z
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-04-28 06:54:46 +0100
message:
Merge back 1.4 to trunk
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3302.68.1
revision-id: mbp at sourcefrog.net-20080428035209-2sfjlaeijx20wt1z
parent: pqm at pqm.ubuntu.com-20080428012318-g5zq9wl2flua3r2s
parent: pqm at pqm.ubuntu.com-20080421101817-kaujt28rg33ijuoy
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Mon 2008-04-28 13:52:09 +1000
message:
Merge back 1.4 and start 1.5 (but not transaction cache reinstatement)
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3302.67.3
revision-id: pqm at pqm.ubuntu.com-20080421101817-kaujt28rg33ijuoy
parent: pqm at pqm.ubuntu.com-20080421081730-ai7jv6hodn9n0x5a
parent: mbp at sourcefrog.net-20080421071233-np3nklkrpam4s194
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.4
timestamp: Mon 2008-04-21 11:18:17 +0100
message:
(mbp) prepare 1.4rc2 release
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
------------------------------------------------------------
revno: 3302.65.11
revision-id: mbp at sourcefrog.net-20080421071233-np3nklkrpam4s194
parent: mbp at sourcefrog.net-20080421065028-8syrrbt80tj6mv4g
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.4
timestamp: Mon 2008-04-21 17:12:33 +1000
message:
Prepare 1.4rc2 release
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3302.65.10
revision-id: mbp at sourcefrog.net-20080421065028-8syrrbt80tj6mv4g
parent: mbp at sourcefrog.net-20080421064245-kim0jeqcurcfpsql
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.4
timestamp: Mon 2008-04-21 16:50:28 +1000
message:
merge fix for knit-knit performance regression
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3302.65.9
revision-id: mbp at sourcefrog.net-20080421064245-kim0jeqcurcfpsql
parent: mbp at sourcefrog.net-20080421055156-p5d83v51cecxy8d0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.4
timestamp: Mon 2008-04-21 16:42:45 +1000
message:
merge #205156
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
------------------------------------------------------------
revno: 3302.65.8
revision-id: mbp at sourcefrog.net-20080421055156-p5d83v51cecxy8d0
parent: mbp at sourcefrog.net-20080421055022-21h45gfgf004x4e4
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.4
timestamp: Mon 2008-04-21 15:51:56 +1000
message:
Change assertion to a plain raise
modified:
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3302.65.7
revision-id: mbp at sourcefrog.net-20080421055022-21h45gfgf004x4e4
parent: mbp at sourcefrog.net-20080421054330-opwod8ybwkheuk95
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.4
timestamp: Mon 2008-04-21 15:50:22 +1000
message:
Merge fix for #211661, problem with log over hpss
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3302.65.6
revision-id: mbp at sourcefrog.net-20080421054330-opwod8ybwkheuk95
parent: mbp at sourcefrog.net-20080421041949-3k7igivnwujpwcnb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.4
timestamp: Mon 2008-04-21 15:43:30 +1000
message:
re-enable transaction cache to speed knit access (cherrypick robertc)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
------------------------------------------------------------
revno: 3302.67.2
revision-id: pqm at pqm.ubuntu.com-20080421081730-ai7jv6hodn9n0x5a
parent: pqm at pqm.ubuntu.com-20080421061446-ayybzxf4py1jux1p
parent: mbp at sourcefrog.net-20080421041949-3k7igivnwujpwcnb
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.4
timestamp: Mon 2008-04-21 09:17:30 +0100
message:
(jam) #209948 skip ghosts when logging specified file
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
------------------------------------------------------------
revno: 3302.65.5
revision-id: mbp at sourcefrog.net-20080421041949-3k7igivnwujpwcnb
parent: mbp at sourcefrog.net-20080411071858-9psl5lr3ko4b9bzw
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.4
timestamp: Mon 2008-04-21 14:19:49 +1000
message:
(merge) #209948 skip ghosts when logging specified file
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
------------------------------------------------------------
revno: 3302.67.1
revision-id: pqm at pqm.ubuntu.com-20080421061446-ayybzxf4py1jux1p
parent: pqm at pqm.ubuntu.com-20080411023221-tiv070pmkmf5q726
parent: mbp at sourcefrog.net-20080411071858-9psl5lr3ko4b9bzw
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.4
timestamp: Mon 2008-04-21 07:14:46 +0100
message:
Prepare 1.4rc1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3302.65.4
revision-id: mbp at sourcefrog.net-20080411071858-9psl5lr3ko4b9bzw
parent: mbp at sourcefrog.net-20080411071846-3rhfzykpyhhln6sl
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.4
timestamp: Fri 2008-04-11 17:18:58 +1000
message:
Prepare 1.4rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3302.65.3
revision-id: mbp at sourcefrog.net-20080411071846-3rhfzykpyhhln6sl
parent: mbp at sourcefrog.net-20080411055054-x96oolbsl3w0nkb8
parent: mbp at sourcefrog.net-20080410070231-movepf7e1890j2qn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.4
timestamp: Fri 2008-04-11 17:18:46 +1000
message:
merge 'make dist' and 'version --short'
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3302.66.9
revision-id: mbp at sourcefrog.net-20080410070231-movepf7e1890j2qn
parent: mbp at sourcefrog.net-20080410023452-co1e7shj3k0chie5
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: make-dist
timestamp: Thu 2008-04-10 17:02:31 +1000
message:
Correct short version test
modified:
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
------------------------------------------------------------
revno: 3302.66.8
revision-id: mbp at sourcefrog.net-20080410023452-co1e7shj3k0chie5
parent: mbp at sourcefrog.net-20080409043557-5btcpm5wdht0ejdi
parent: pqm at pqm.ubuntu.com-20080409233555-n26cmi0y1hb98tf6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: make-dist
timestamp: Thu 2008-04-10 12:34:52 +1000
message:
Reconcile NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_subsume.py test_subsume.py-20060927040024-tsvh4pchajoayymg-1
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3302.66.7
revision-id: mbp at sourcefrog.net-20080409043557-5btcpm5wdht0ejdi
parent: mbp at sourcefrog.net-20080409035342-wm21vsrt7tz26g0t
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: make-dist
timestamp: Wed 2008-04-09 14:35:57 +1000
message:
Commands should use self.outf not print
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3302.66.6
revision-id: mbp at sourcefrog.net-20080409035342-wm21vsrt7tz26g0t
parent: mbp at sourcefrog.net-20080409034848-sm47wz1fg12h57db
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: make-dist
timestamp: Wed 2008-04-09 13:53:42 +1000
message:
NEWS updates
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3302.66.5
revision-id: mbp at sourcefrog.net-20080409034848-sm47wz1fg12h57db
parent: mbp at sourcefrog.net-20080409032923-uh6hxeubehsb9zm0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: make-dist
timestamp: Wed 2008-04-09 13:48:48 +1000
message:
Add check-dist-tarball to run tests from the packaged source
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
------------------------------------------------------------
revno: 3302.66.4
revision-id: mbp at sourcefrog.net-20080409032923-uh6hxeubehsb9zm0
parent: mbp at sourcefrog.net-20080409032500-mjo6ewg4q9onsrqm
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: make-dist
timestamp: Wed 2008-04-09 13:29:23 +1000
message:
Update developer documentation for new makefile dist targets
modified:
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3302.66.3
revision-id: mbp at sourcefrog.net-20080409032500-mjo6ewg4q9onsrqm
parent: mbp at sourcefrog.net-20080409031523-gms00duf018304og
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: make-dist
timestamp: Wed 2008-04-09 13:25:00 +1000
message:
Add dist-upload-escudero target
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
------------------------------------------------------------
revno: 3302.66.2
revision-id: mbp at sourcefrog.net-20080409031523-gms00duf018304og
parent: mbp at sourcefrog.net-20080409030130-zu2daqbndi8a4uu0
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: make-dist
timestamp: Wed 2008-04-09 13:15:23 +1000
message:
Add a simple 'make dist' rule
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3302.66.1
revision-id: mbp at sourcefrog.net-20080409030130-zu2daqbndi8a4uu0
parent: pqm at pqm.ubuntu.com-20080408192311-eoozb2m0s383xt35
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: make-dist
timestamp: Wed 2008-04-09 13:01:30 +1000
message:
Add version --short option
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
------------------------------------------------------------
revno: 3302.65.2
revision-id: mbp at sourcefrog.net-20080411055054-x96oolbsl3w0nkb8
parent: mbp at sourcefrog.net-20080411054511-7nw14wjctukkfqou
parent: andrew.bennetts at canonical.com-20080411045144-nu3ofu2nrfyszvma
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.4
timestamp: Fri 2008-04-11 15:50:54 +1000
message:
Add a hook for Branch.set_last_revision_info.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
------------------------------------------------------------
revno: 3302.65.1
revision-id: mbp at sourcefrog.net-20080411054511-7nw14wjctukkfqou
parent: pqm at pqm.ubuntu.com-20080411023221-tiv070pmkmf5q726
parent: andrew.bennetts at canonical.com-20080410091639-6hwphp6m3c0rg44t
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.4
timestamp: Fri 2008-04-11 15:45:11 +1000
message:
merge fix for Paramiko versions newer than 1.7.2 #213425
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
------------------------------------------------------------
revno: 3302.3.82
revision-id: pqm at pqm.ubuntu.com-20080428032913-4fgik9du2kpxl8sf
parent: pqm at pqm.ubuntu.com-20080428012318-g5zq9wl2flua3r2s
parent: aaron at aaronbentley.com-20080428012745-n6x7a8cymzkswbtv
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-04-28 04:29:13 +0100
message:
(abentley,
robertc) Avoid pack name collisions when fetching all revisions
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 1551.19.38
revision-id: aaron at aaronbentley.com-20080428012745-n6x7a8cymzkswbtv
parent: aaron at aaronbentley.com-20080425221600-j1nkw6v8corwgw19
parent: pqm at pqm.ubuntu.com-20080428012318-g5zq9wl2flua3r2s
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: Aaron's mergeable stuff
timestamp: Sun 2008-04-27 21:27:45 -0400
message:
Merge with bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 1551.19.37
revision-id: aaron at aaronbentley.com-20080425221600-j1nkw6v8corwgw19
parent: aaron at aaronbentley.com-20080425221234-ov2ahpio6y54mnlq
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2008-04-25 18:16:00 -0400
message:
Remove workarounds for bug 212908
modified:
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 1551.19.36
revision-id: aaron at aaronbentley.com-20080425221234-ov2ahpio6y54mnlq
parent: aaron at aaronbentley.com-20080424214953-5ddh20nq0eipfxh1
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: Aaron's mergeable stuff
timestamp: Fri 2008-04-25 18:12:34 -0400
message:
Prevent fetch all from causing pack collisions
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
------------------------------------------------------------
revno: 3302.3.81
revision-id: pqm at pqm.ubuntu.com-20080428012318-g5zq9wl2flua3r2s
parent: pqm at pqm.ubuntu.com-20080427070204-4t5flfqnnmr6bmiw
parent: ian.clatworthy at canonical.com-20080427223834-hcxv61ovf603klrt
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-04-28 02:23:18 +0100
message:
commit now works with Microsoft FTP (Andreas Deininger)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 3302.64.1
revision-id: ian.clatworthy at canonical.com-20080427223834-hcxv61ovf603klrt
parent: pqm at pqm.ubuntu.com-20080427070204-4t5flfqnnmr6bmiw
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Mon 2008-04-28 08:38:34 +1000
message:
commit now works with Microsoft FTP (Andreas Deininger)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 3302.3.80
revision-id: pqm at pqm.ubuntu.com-20080427070204-4t5flfqnnmr6bmiw
parent: pqm at pqm.ubuntu.com-20080425215735-sa37dllaxjo2o7do
parent: aaron at aaronbentley.com-20080426164057-s3kl8d43lvf40x9p
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sun 2008-04-27 08:02:04 +0100
message:
Remove locking from generators
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 3302.63.4
revision-id: aaron at aaronbentley.com-20080426164057-s3kl8d43lvf40x9p
parent: aaron at aaronbentley.com-20080426163447-zaj22oysskneh5og
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: fetch-locking
timestamp: Sat 2008-04-26 12:40:57 -0400
message:
Add NEWS entry
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3302.63.3
revision-id: aaron at aaronbentley.com-20080426163447-zaj22oysskneh5og
parent: aaron at aaronbentley.com-20080426060728-dso3gzg3nuilqqto
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: fetch-locking
timestamp: Sat 2008-04-26 12:34:47 -0400
message:
Stop locking in get_data_stream_for_search
modified:
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 3302.63.2
revision-id: aaron at aaronbentley.com-20080426060728-dso3gzg3nuilqqto
parent: aaron at aaronbentley.com-20080425231410-nk29f2kt9ah2a1vq
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: fetch-locking
timestamp: Sat 2008-04-26 02:07:28 -0400
message:
Cleanup
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
------------------------------------------------------------
revno: 3302.63.1
revision-id: aaron at aaronbentley.com-20080425231410-nk29f2kt9ah2a1vq
parent: pqm at pqm.ubuntu.com-20080425215735-sa37dllaxjo2o7do
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: fetch-locking
timestamp: Fri 2008-04-25 19:14:10 -0400
message:
Fix lock-taking iterators
modified:
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3302.3.79
revision-id: pqm at pqm.ubuntu.com-20080425215735-sa37dllaxjo2o7do
parent: pqm at pqm.ubuntu.com-20080424185721-ukk0dncnc4xpqk5o
parent: aaron at aaronbentley.com-20080424214953-5ddh20nq0eipfxh1
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-04-25 22:57:35 +0100
message:
Speed up diff by using more efficient API for selecting revisions
(abentley)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
------------------------------------------------------------
revno: 1551.19.35
revision-id: aaron at aaronbentley.com-20080424214953-5ddh20nq0eipfxh1
parent: aaron at aaronbentley.com-20080424213149-ekqo3hiukqnoif58
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2008-04-24 17:49:53 -0400
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 1551.19.34
revision-id: aaron at aaronbentley.com-20080424213149-ekqo3hiukqnoif58
parent: aaron at aaronbentley.com-20080424201025-ows0yk4ecf8o5zcf
parent: pqm at pqm.ubuntu.com-20080424185721-ukk0dncnc4xpqk5o
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2008-04-24 17:31:49 -0400
message:
Merge with bzr.dev
removed:
bzrlib/xml6.py xml6.py-20060823042456-dbaaq4atrche7xy5-1
added:
bzrlib/tests/test_mutabletree.py test_mutabletree.py-20080405014429-2v0cdi3re320p8db-1
bzrlib/xml5.py xml5.py-20080328030717-t9guwinq8hom0ar3-1
bzrlib/xml6.py xml6.py-20080327235607-1skmbg4o9cd1o636-1
doc/developers/integration.txt integration.txt-20080404022341-2lorxocp1in07zij-1
doc/developers/plugin-api.txt pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
doc/developers/tortoise-strategy.txt tortoisestrategy.txt-20080403024510-2ahdqrvnwqrb5p5t-1
renamed:
bzrlib/xml5.py => bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugin.py plugin.py-20050622060424-829b654519533d69
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/tests/TestUtil.py TestUtil.py-20050824080200-5f70140a2d938694
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/blackbox/test_switch.py test_switch.py-20071122111948-0c5en6uz92bwl76h-1
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_subsume.py test_subsume.py-20060927040024-tsvh4pchajoayymg-1
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
doc/en/user-guide/core_concepts.txt core_concepts.txt-20071114035000-q36a9h57ps06uvnl-2
doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
------------------------------------------------------------
revno: 1551.19.33
revision-id: aaron at aaronbentley.com-20080424201025-ows0yk4ecf8o5zcf
parent: aaron at aaronbentley.com-20080404042019-zwpkw158y1411rw7
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: Aaron's mergeable stuff
timestamp: Thu 2008-04-24 16:10:25 -0400
message:
Use as_revision_id for diff
modified:
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
------------------------------------------------------------
revno: 3302.3.78
revision-id: pqm at pqm.ubuntu.com-20080424185721-ukk0dncnc4xpqk5o
parent: pqm at pqm.ubuntu.com-20080424072816-jjx4v6pqude11ys2
parent: aaron at aaronbentley.com-20080424164423-i2wobvoi7xmzxnvc
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-04-24 19:57:21 +0100
message:
Prevent losing data when reconfiguring to lightweight checkout
(abentley)
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 3302.62.5
revision-id: aaron at aaronbentley.com-20080424164423-i2wobvoi7xmzxnvc
parent: aaron at aaronbentley.com-20080424053319-9a13fu46i2ameb5i
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: reconfigure-lightweight-check
timestamp: Thu 2008-04-24 12:44:23 -0400
message:
Tweak text
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
------------------------------------------------------------
revno: 3302.62.4
revision-id: aaron at aaronbentley.com-20080424053319-9a13fu46i2ameb5i
parent: aaron at aaronbentley.com-20080424045842-0cajl9v6s4u52kaw
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: reconfigure-lightweight-check
timestamp: Thu 2008-04-24 01:33:19 -0400
message:
Add sync-for-reconfigure help topic
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
------------------------------------------------------------
revno: 3302.62.3
revision-id: aaron at aaronbentley.com-20080424045842-0cajl9v6s4u52kaw
parent: aaron at aaronbentley.com-20080408055335-86c71v5wpx2p5gzv
parent: pqm at pqm.ubuntu.com-20080422120059-sony5sthnlewabge
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: reconfigure-lightweight-check
timestamp: Thu 2008-04-24 00:58:42 -0400
message:
Merge bzr.dev
removed:
bzrlib/xml6.py xml6.py-20060823042456-dbaaq4atrche7xy5-1
added:
bzrlib/xml5.py xml5.py-20080328030717-t9guwinq8hom0ar3-1
bzrlib/xml6.py xml6.py-20080327235607-1skmbg4o9cd1o636-1
doc/developers/integration.txt integration.txt-20080404022341-2lorxocp1in07zij-1
doc/developers/plugin-api.txt pluginapi.txt-20080229110225-q2j5y4agqhlkjn0s-1
doc/developers/tortoise-strategy.txt tortoisestrategy.txt-20080403024510-2ahdqrvnwqrb5p5t-1
renamed:
bzrlib/xml5.py => bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/help_topics/__init__.py help_topics.py-20060920210027-rnim90q9e0bwxvy4-1
bzrlib/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
bzrlib/help_topics/en/hooks.txt hooks.txt-20070830033044-xxu2rced13f72dka-1
bzrlib/inventory.py inventory.py-20050309040759-6648b84ca2005b37
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/multiparent.py __init__.py-20070410133617-n1jdhcc1n1mibarp-1
bzrlib/osutils.py osutils.py-20050309040759-eeaff12fbf77ac86
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/progress.py progress.py-20050610070202-df9faaab791964c0
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repofmt/weaverepo.py presplitout.py-20070125045333-wfav3tsh73oxu3zk-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
bzrlib/smart/medium.py medium.py-20061103051856-rgu2huy59fkz902q-1
bzrlib/smart/protocol.py protocol.py-20061108035435-ot0lstk2590yqhzr-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/blackbox/test_status.py teststatus.py-20050712014354-508855eb9f29f7dc
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/bzrdir_implementations/__init__.py __init__.py-20060131065642-34c39b54f42dd048
bzrlib/tests/bzrdir_implementations/test_bzrdir.py test_bzrdir.py-20060131065642-0ebeca5e30e30866
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/interversionedfile_implementations/__init__.py __init__.py-20060302012326-981af525594d02ed
bzrlib/tests/repository_implementations/test_check_reconcile.py test_broken.py-20070928125406-62236394w0jpbpd6-2
bzrlib/tests/repository_implementations/test_fetch.py test_fetch.py-20070814052151-5cxha9slx4c93uog-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/revisionstore_implementations/test_all.py test_all.py-20060303020702-9b2d4c1d75407f31
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_merge.py testmerge.py-20050905070950-c1b5aa49ff911024
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_subsume.py test_subsume.py-20060927040024-tsvh4pchajoayymg-1
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/remote.py ssh.py-20060608202016-c25gvf1ob7ypbus6-1
bzrlib/transport/sftp.py sftp.py-20051019050329-ab48ce71b7e32dfe
bzrlib/transport/ssh.py ssh.py-20060824042150-0s9787kng6zv1nwq-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/index.txt index.txt-20070508041241-qznziunkg0nffhiw-1
doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
------------------------------------------------------------
revno: 3302.62.2
revision-id: aaron at aaronbentley.com-20080408055335-86c71v5wpx2p5gzv
parent: aaron at aaronbentley.com-20080406165435-cqhh3rg3gt1qzp11
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: reconfigure-lightweight-check
timestamp: Tue 2008-04-08 01:53:35 -0400
message:
Split out tests even further
modified:
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 3302.62.1
revision-id: aaron at aaronbentley.com-20080406165435-cqhh3rg3gt1qzp11
parent: pqm at pqm.ubuntu.com-20080406101328-z1x7a0hsejxblf39
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: reconfigure-lightweight-check
timestamp: Sun 2008-04-06 12:54:35 -0400
message:
Raise an error when converting a branch to a lightweight checkout loses data
modified:
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-1
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
------------------------------------------------------------
revno: 3302.3.77
revision-id: pqm at pqm.ubuntu.com-20080424072816-jjx4v6pqude11ys2
parent: pqm at pqm.ubuntu.com-20080424051908-kyhfubgxkuvu5bqc
parent: mbp at sourcefrog.net-20080424033054-tder52xdjbq39x5t
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-04-24 08:28:16 +0100
message:
(mbp) Better help and docs for send
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
------------------------------------------------------------
revno: 3302.61.2
revision-id: mbp at sourcefrog.net-20080424033054-tder52xdjbq39x5t
parent: mbp at sourcefrog.net-20080424012726-az7wb11knbdwzqhv
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2008-04-24 13:30:54 +1000
message:
Say 'merge directive' rather than just 'directive' in help
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3302.61.1
revision-id: mbp at sourcefrog.net-20080424012726-az7wb11knbdwzqhv
parent: pqm at pqm.ubuntu.com-20080422120059-sony5sthnlewabge
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: doc
timestamp: Thu 2008-04-24 11:27:26 +1000
message:
doc: send -o, and more on send in user guide
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
------------------------------------------------------------
revno: 3302.3.76
revision-id: pqm at pqm.ubuntu.com-20080424051908-kyhfubgxkuvu5bqc
parent: pqm at pqm.ubuntu.com-20080422120059-sony5sthnlewabge
parent: aaron at aaronbentley.com-20080424031236-erfcp6zsvkfiiruq
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-04-24 06:19:08 +0100
message:
Add documentation of ignore command (nmb)
modified:
doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
------------------------------------------------------------
revno: 3302.60.1
revision-id: aaron at aaronbentley.com-20080424031236-erfcp6zsvkfiiruq
parent: pqm at pqm.ubuntu.com-20080422120059-sony5sthnlewabge
parent: nmb at wartburg.edu-20080418010617-zeqt8465w8gqjivq
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: bzr.ab.integration
timestamp: Wed 2008-04-23 23:12:36 -0400
message:
Merge add-ignore patch
modified:
doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
------------------------------------------------------------
revno: 3302.59.1
revision-id: nmb at wartburg.edu-20080418010617-zeqt8465w8gqjivq
parent: pqm at pqm.ubuntu.com-20080417155359-m3nxwwr442bgmsne
committer: Neil Martinsen-Burrell <nmb at wartburg.edu>
branch nick: add-ignore
timestamp: Thu 2008-04-17 20:06:17 -0500
message:
add bzr ignore to the Users Guide
modified:
doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
-------------- next part --------------
Diff too large for email (1217 lines, the limit is 1000).
More information about the bazaar-commits
mailing list