Rev 3421: merge bzr.dev, resolve NEWS in http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/submitted
John Arbash Meinel
john at arbash-meinel.com
Mon May 5 21:43:02 BST 2008
At http://bzr.arbash-meinel.com/branches/bzr/1.4-dev/submitted
------------------------------------------------------------
revno: 3421
revision-id: john at arbash-meinel.com-20080505204238-598hf62krc3wwcin
parent: john at arbash-meinel.com-20080505202906-0utn8d1ti6458rea
parent: pqm at pqm.ubuntu.com-20080505041432-g51fjlrfth74arug
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: submitted
timestamp: Mon 2008-05-05 15:42:38 -0500
message:
merge bzr.dev, resolve NEWS
added:
bzrlib/tests/branch_implementations/test_check.py test_check.py-20080429151303-1sbfclxhddpz0tnj-1
bzrlib/tests/branch_implementations/test_reconcile.py test_reconcile.py-20080429161555-qlmccuyeyt6pvho7-1
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
modified:
Makefile Makefile-20050805140406-d96e3498bb61c5bb
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
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/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
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/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-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/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_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
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_repository.py test_repository.py-20060131075918-65c555b881612f4d
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/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
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/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/default.css default.css-20060622101119-tgwtdci8z769bjb9-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
doc/en/user-guide/controlling_registration.txt controlling_registra-20071121073725-0corxykv5irjal00-3
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/sending_changes.txt sending_changes.txt-20071123154453-dk2mjhrg1vpjm5w2-4
------------------------------------------------------------
revno: 3377.2.29
revision-id: pqm at pqm.ubuntu.com-20080505041432-g51fjlrfth74arug
parent: pqm at pqm.ubuntu.com-20080502230043-zwk3y5idlir4uak1
parent: robertc at robertcollins.net-20080505020610-mqsdf2sb5hc4jtap
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-05-05 05:14:32 +0100
message:
(robertc) Preserve test ids correctly to aid debugging. (Robert
Collins, Andrew Bennetts)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3377.23.1
revision-id: robertc at robertcollins.net-20080505020610-mqsdf2sb5hc4jtap
parent: pqm at pqm.ubuntu.com-20080502230043-zwk3y5idlir4uak1
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Mon 2008-05-05 12:06:10 +1000
message:
(robertc) Preserve test ids correctly to aid debugging. (Robert Collins, Andrew Bennetts)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3377.2.28
revision-id: pqm at pqm.ubuntu.com-20080502230043-zwk3y5idlir4uak1
parent: pqm at pqm.ubuntu.com-20080502140826-nhg73h31i9viu175
parent: jelmer at samba.org-20080502204834-my32q7sjr6ifw01k
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Sat 2008-05-03 00:00:43 +0100
message:
(Jelmer) Deprecate Repository.revision_parents().
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3377.22.3
revision-id: jelmer at samba.org-20080502204834-my32q7sjr6ifw01k
parent: jelmer at samba.org-20080502175841-co0gzoetx26wt42e
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Fri 2008-05-02 22:48:34 +0200
message:
Fix argument to get_parent_map() in NEWS.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3377.22.2
revision-id: jelmer at samba.org-20080502175841-co0gzoetx26wt42e
parent: jelmer at samba.org-20080502160543-obrvpwdccxf4yq9h
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Fri 2008-05-02 19:58:41 +0200
message:
Change recommended replacement for Repository.revision_parents(), deprecate knitrepo implementation as well
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
------------------------------------------------------------
revno: 3377.22.1
revision-id: jelmer at samba.org-20080502160543-obrvpwdccxf4yq9h
parent: pqm at pqm.ubuntu.com-20080501153825-fbc1be2c4g22idz8
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: bzr.dev
timestamp: Fri 2008-05-02 18:05:43 +0200
message:
Deprecated Repository.revision_parents.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 3377.2.27
revision-id: pqm at pqm.ubuntu.com-20080502140826-nhg73h31i9viu175
parent: pqm at pqm.ubuntu.com-20080502115300-98iunzq9437108n5
parent: mbp at sourcefrog.net-20080501040939-i7xw7tt9h38a9phu
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-05-02 15:08:26 +0100
message:
(mbp) deprecate LocableFiles.get_utf8
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
------------------------------------------------------------
revno: 3377.21.3
revision-id: mbp at sourcefrog.net-20080501040939-i7xw7tt9h38a9phu
parent: mbp at sourcefrog.net-20080501040041-ee778mkbhyem0eqa
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: controlfiles
timestamp: Thu 2008-05-01 14:09:39 +1000
message:
Fix up more uses of LockableFiles.get_utf8 in tests
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/tests/blackbox/test_branch.py test_branch.py-20060524161337-noms9gmcwqqrfi8y-1
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
------------------------------------------------------------
revno: 3377.21.2
revision-id: mbp at sourcefrog.net-20080501040041-ee778mkbhyem0eqa
parent: mbp at sourcefrog.net-20080430125504-82xdxgfirosev448
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: controlfiles
timestamp: Thu 2008-05-01 14:00:41 +1000
message:
Remove long-disabled test test_create_basis_inventory
modified:
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
------------------------------------------------------------
revno: 3377.21.1
revision-id: mbp at sourcefrog.net-20080430125504-82xdxgfirosev448
parent: mbp at sourcefrog.net-20080430080517-bk00bm4j6jk3gcgn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: controlfiles
timestamp: Wed 2008-04-30 22:55:04 +1000
message:
Deprecate LockableFiles.get_utf8
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/lockable_files.py control_files.py-20051111201905-bb88546e799d669f
bzrlib/tests/test_lockable_files.py test_lockable_files.py-20051225183927-365c7fd99591caf1
bzrlib/tests/workingtree_implementations/test_basis_inventory.py test_basis_inventory.py-20051218151655-3650468941091309
------------------------------------------------------------
revno: 3377.2.26
revision-id: pqm at pqm.ubuntu.com-20080502115300-98iunzq9437108n5
parent: pqm at pqm.ubuntu.com-20080502094759-pc5dduhtm7wo40cg
parent: mbp at sourcefrog.net-20080502054354-t1ah9qqd1a156v73
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-05-02 12:53:00 +0100
message:
(mbp) merge 1.3.1 news into trunk
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3377.20.1
revision-id: mbp at sourcefrog.net-20080502054354-t1ah9qqd1a156v73
parent: pqm at pqm.ubuntu.com-20080502052056-i0fgnbrw89ueo423
parent: pqm at pqm.ubuntu.com-20080410124049-lr93doxjjygno0ls
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integrate-1.3
timestamp: Fri 2008-05-02 15:43:54 +1000
message:
merge 1.3.1 back into trunk
(news update only, the fix for #208418 was already merged)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3287.15.2
revision-id: pqm at pqm.ubuntu.com-20080410124049-lr93doxjjygno0ls
parent: pqm at pqm.ubuntu.com-20080404074525-e14k2wuue9uardz6
parent: mbp at sourcefrog.net-20080410072413-bnjumo1fcn57ezvh
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.3
timestamp: Thu 2008-04-10 13:40:49 +0100
message:
Prepare 1.3.1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3287.16.1
revision-id: mbp at sourcefrog.net-20080410072413-bnjumo1fcn57ezvh
parent: pqm at pqm.ubuntu.com-20080404074525-e14k2wuue9uardz6
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.3
timestamp: Thu 2008-04-10 17:24:13 +1000
message:
Prepare 1.3.1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3287.15.1
revision-id: pqm at pqm.ubuntu.com-20080404074525-e14k2wuue9uardz6
parent: pqm at pqm.ubuntu.com-20080320092314-y4i0bpy37v8i1mc5
parent: mbp at sourcefrog.net-20080404060940-pkcm2gpdxboot3em
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.3
timestamp: Fri 2008-04-04 08:45:25 +0100
message:
Fix 208418 and prepare 1.3rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3287.14.3
revision-id: mbp at sourcefrog.net-20080404060940-pkcm2gpdxboot3em
parent: mbp at sourcefrog.net-20080404060718-duljxhe92djgiz0h
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.3
timestamp: Fri 2008-04-04 17:09:40 +1100
message:
Prepare 1.3.1rc1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3287.14.2
revision-id: mbp at sourcefrog.net-20080404060718-duljxhe92djgiz0h
parent: mbp at sourcefrog.net-20080404060424-6r40a2iu4igsm7zb
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.3
timestamp: Fri 2008-04-04 17:07:18 +1100
message:
Add NEWS about #208418
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3287.14.1
revision-id: mbp at sourcefrog.net-20080404060424-6r40a2iu4igsm7zb
parent: pqm at pqm.ubuntu.com-20080320092314-y4i0bpy37v8i1mc5
parent: mbp at sourcefrog.net-20080404055815-hnjqcoe0z1psu8aj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.3
timestamp: Fri 2008-04-04 17:04:24 +1100
message:
Merge fix without tests for #208418
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3287.13.1
revision-id: mbp at sourcefrog.net-20080404055815-hnjqcoe0z1psu8aj
parent: mbp at sourcefrog.net-20080404043344-ewtd0ck2mm0l7sx9
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 208418-knit-parsing
timestamp: Fri 2008-04-04 16:58:15 +1100
message:
_StreamIndex.get_options: avoid mutating a list from the basis knit
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3377.2.25
revision-id: pqm at pqm.ubuntu.com-20080502094759-pc5dduhtm7wo40cg
parent: pqm at pqm.ubuntu.com-20080502073615-9p6e3x4ijlv6bker
parent: mbp at sourcefrog.net-20080502053336-nai827prrl3t21es
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-05-02 10:47:59 +0100
message:
(mbp,trivial) fix stray comment
modified:
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
------------------------------------------------------------
revno: 3377.19.1
revision-id: mbp at sourcefrog.net-20080502053336-nai827prrl3t21es
parent: pqm at pqm.ubuntu.com-20080502052056-i0fgnbrw89ueo423
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: 202778-version-tests
timestamp: Fri 2008-05-02 15:33:36 +1000
message:
Fix up stray comment
modified:
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
------------------------------------------------------------
revno: 3377.2.24
revision-id: pqm at pqm.ubuntu.com-20080502073615-9p6e3x4ijlv6bker
parent: pqm at pqm.ubuntu.com-20080502052056-i0fgnbrw89ueo423
parent: mbp at sourcefrog.net-20080502051009-ipu3n3ma01711eqe
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-05-02 08:36:15 +0100
message:
(mbp) merge 1.4final back to trunk
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3377.18.1
revision-id: mbp at sourcefrog.net-20080502051009-ipu3n3ma01711eqe
parent: pqm at pqm.ubuntu.com-20080501153825-fbc1be2c4g22idz8
parent: pqm at pqm.ubuntu.com-20080501133316-80flel6b5rzez8an
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: integration
timestamp: Fri 2008-05-02 15:10:09 +1000
message:
Merge 1.4final back to trunk
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3360.3.4
revision-id: pqm at pqm.ubuntu.com-20080501133316-80flel6b5rzez8an
parent: pqm at pqm.ubuntu.com-20080421101817-kaujt28rg33ijuoy
parent: mbp at sourcefrog.net-20080501024246-x13lcwcda0h7j49f
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: 1.4
timestamp: Thu 2008-05-01 14:33:16 +0100
message:
Prepare 1.4final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3360.4.2
revision-id: mbp at sourcefrog.net-20080501024246-x13lcwcda0h7j49f
parent: mbp at sourcefrog.net-20080501021124-0qn38w8zavyym5b8
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.4
timestamp: Thu 2008-05-01 12:42:46 +1000
message:
merge fix and test for #214894
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3360.4.1
revision-id: mbp at sourcefrog.net-20080501021124-0qn38w8zavyym5b8
parent: pqm at pqm.ubuntu.com-20080421101817-kaujt28rg33ijuoy
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: prepare-1.4
timestamp: Thu 2008-05-01 12:11:24 +1000
message:
Add news and version number for 1.4final
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3377.2.23
revision-id: pqm at pqm.ubuntu.com-20080502052056-i0fgnbrw89ueo423
parent: pqm at pqm.ubuntu.com-20080501153825-fbc1be2c4g22idz8
parent: robertc at robertcollins.net-20080502011532-otm7de2qewba7e30
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Fri 2008-05-02 06:20:56 +0100
message:
(robertc) Fix error reporting with bad revision parsing in weave
repositories. (Robert Collins)
modified:
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
------------------------------------------------------------
revno: 3377.17.1
revision-id: robertc at robertcollins.net-20080502011532-otm7de2qewba7e30
parent: pqm at pqm.ubuntu.com-20080501153825-fbc1be2c4g22idz8
committer: Robert Collins <robertc at robertcollins.net>
branch nick: misc-fixen
timestamp: Fri 2008-05-02 11:15:32 +1000
message:
Fix error reporting with bad revision parsing in weave repositories.
modified:
bzrlib/store/revision/text.py text.py-20060303020652-e49155f0da4d14ab
------------------------------------------------------------
revno: 3377.2.22
revision-id: pqm at pqm.ubuntu.com-20080501153825-fbc1be2c4g22idz8
parent: pqm at pqm.ubuntu.com-20080501112512-b9lgs4w8r43evtn1
parent: ian.clatworthy at canonical.com-20080501050654-y6ht6lylvyl0g6rd
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-05-01 16:38:25 +0100
message:
Minor docstring cleanups (Ian Clatworthy)
modified:
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
------------------------------------------------------------
revno: 3377.16.1
revision-id: ian.clatworthy at canonical.com-20080501050654-y6ht6lylvyl0g6rd
parent: pqm at pqm.ubuntu.com-20080501045531-3hkmq9qzoeequw1s
parent: ian.clatworthy at canonical.com-20080501031512-nxtv5cpcr3unqkf0
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Thu 2008-05-01 15:06:54 +1000
message:
Minor docstring cleanups (Ian Clatworthy)
modified:
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
------------------------------------------------------------
revno: 3377.15.2
revision-id: ian.clatworthy at canonical.com-20080501031512-nxtv5cpcr3unqkf0
parent: ian.clatworthy at canonical.com-20080501030859-8uu0pyuk36w0zkab
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: cleanups
timestamp: Thu 2008-05-01 13:15:12 +1000
message:
show_tree_status docstring and deprecation cleanups
modified:
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
------------------------------------------------------------
revno: 3377.15.1
revision-id: ian.clatworthy at canonical.com-20080501030859-8uu0pyuk36w0zkab
parent: pqm at pqm.ubuntu.com-20080430182230-iz5tit0t2ut5clww
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: cleanups
timestamp: Thu 2008-05-01 13:08:59 +1000
message:
add docstring for put_file_bytes_non_atomic
modified:
bzrlib/mutabletree.py mutabletree.py-20060906023413-4wlkalbdpsxi2r4y-2
------------------------------------------------------------
revno: 3377.2.21
revision-id: pqm at pqm.ubuntu.com-20080501112512-b9lgs4w8r43evtn1
parent: pqm at pqm.ubuntu.com-20080501091514-61b80pvo69wnhf2t
parent: andrew.bennetts at canonical.com-20080501004334-2m1vke5vkohpq172
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-05-01 12:25:12 +0100
message:
Add the smart protocol v3 specification to network-protocol.txt
modified:
doc/default.css default.css-20060622101119-tgwtdci8z769bjb9-1
doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
------------------------------------------------------------
revno: 3211.7.10
revision-id: andrew.bennetts at canonical.com-20080501004334-2m1vke5vkohpq172
parent: andrew.bennetts at canonical.com-20080220121704-h65l9ol4g1d4dk0v
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: protocol-v3-doc
timestamp: Thu 2008-05-01 10:43:34 +1000
message:
Trivial tweaks to keep network-protocol.txt current with implementation.
modified:
doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
------------------------------------------------------------
revno: 3211.7.9
revision-id: andrew.bennetts at canonical.com-20080220121704-h65l9ol4g1d4dk0v
parent: andrew.bennetts at canonical.com-20080220092550-ig314l6l188b0vmc
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: protocol-v3-doc
timestamp: Wed 2008-02-20 23:17:04 +1100
message:
Remove CHUNKED_BYTES message part; it's unnecessary. Also polished the text a little.
modified:
doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
------------------------------------------------------------
revno: 3211.7.8
revision-id: andrew.bennetts at canonical.com-20080220092550-ig314l6l188b0vmc
parent: andrew.bennetts at canonical.com-20080220061429-sc6xla297wy2dnio
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: protocol-v3-doc
timestamp: Wed 2008-02-20 20:25:50 +1100
message:
Cosmetic tweaks.
modified:
doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
------------------------------------------------------------
revno: 3211.7.7
revision-id: andrew.bennetts at canonical.com-20080220061429-sc6xla297wy2dnio
parent: andrew.bennetts at canonical.com-20080214225755-fzmw8cgiw3thn9uk
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: protocol-v3-doc
timestamp: Wed 2008-02-20 17:14:29 +1100
message:
Update the protocol spec for Robert and Martin's latest comments.
modified:
doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
------------------------------------------------------------
revno: 3211.7.6
revision-id: andrew.bennetts at canonical.com-20080214225755-fzmw8cgiw3thn9uk
parent: andrew.bennetts at canonical.com-20080211093814-rxkawg4lbjteeb8x
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: protocol-v3-doc
timestamp: Fri 2008-02-15 09:57:55 +1100
message:
Take Martin's latest comments into account: Keep symmetry of requests and responses, allow streamed bodies to be explicitly interrupted with an error.
modified:
doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
------------------------------------------------------------
revno: 3211.7.5
revision-id: andrew.bennetts at canonical.com-20080211093814-rxkawg4lbjteeb8x
parent: andrew.bennetts at canonical.com-20080211064548-ezbwec9slxsmz7k3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: protocol-v3-doc
timestamp: Mon 2008-02-11 20:38:14 +1100
message:
Describe how error during streamed request bodies ought to be handled.
modified:
doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
------------------------------------------------------------
revno: 3211.7.4
revision-id: andrew.bennetts at canonical.com-20080211064548-ezbwec9slxsmz7k3
parent: andrew.bennetts at canonical.com-20080207070513-u7tvul100g1yn6n7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: protocol-v3-doc
timestamp: Mon 2008-02-11 17:45:48 +1100
message:
Add another XXX, tweak grammar to allow a streamed body with zero chunks.
modified:
doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
------------------------------------------------------------
revno: 3211.7.3
revision-id: andrew.bennetts at canonical.com-20080207070513-u7tvul100g1yn6n7
parent: andrew.bennetts at canonical.com-20080207065757-cyw15130ejca3db3
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: protocol-v3-doc
timestamp: Thu 2008-02-07 18:05:13 +1100
message:
Add a comment to the new CSS.
modified:
doc/default.css default.css-20060622101119-tgwtdci8z769bjb9-1
------------------------------------------------------------
revno: 3211.7.2
revision-id: andrew.bennetts at canonical.com-20080207065757-cyw15130ejca3db3
parent: andrew.bennetts at canonical.com-20080204043408-w1rlbu9s7mkcohdp
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: protocol-v3-doc
timestamp: Thu 2008-02-07 17:57:57 +1100
message:
Tweak the proposed protocol according to review comments.
modified:
doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
------------------------------------------------------------
revno: 3211.7.1
revision-id: andrew.bennetts at canonical.com-20080204043408-w1rlbu9s7mkcohdp
parent: pqm at pqm.ubuntu.com-20080201053934-q32y2nk5vvo13c6v
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: protocol-v3-doc
timestamp: Mon 2008-02-04 15:34:08 +1100
message:
Add description of proposed new network protocol to developer docs (and fix some minor inaccuracies in previous versions' descriptions).
modified:
doc/default.css default.css-20060622101119-tgwtdci8z769bjb9-1
doc/developers/network-protocol.txt networkprotocol.txt-20070903044232-woustorrjbmg5zol-1
------------------------------------------------------------
revno: 3377.2.20
revision-id: pqm at pqm.ubuntu.com-20080501091514-61b80pvo69wnhf2t
parent: pqm at pqm.ubuntu.com-20080501070304-s4tdgkmt0ghea1i1
parent: andrew.bennetts at canonical.com-20080501021559-mhydylxp2la4guo6
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-05-01 10:15:14 +0100
message:
(jam) Fix RemoteRepository.get_parent_map() when server is <v1.2
(#214894)
modified:
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3377.11.3
revision-id: andrew.bennetts at canonical.com-20080501021559-mhydylxp2la4guo6
parent: andrew.bennetts at canonical.com-20080430233632-0hrshmlsdhdkiwcq
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: johns-bug
timestamp: Thu 2008-05-01 12:15:59 +1000
message:
Remove XXX from test description.
modified:
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3377.11.2
revision-id: andrew.bennetts at canonical.com-20080430233632-0hrshmlsdhdkiwcq
parent: john at arbash-meinel.com-20080429200228-ubbv2h0sqtrt0tsi
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: johns-bug
timestamp: Thu 2008-05-01 09:36:32 +1000
message:
Add test for the bug John found.
modified:
bzrlib/tests/test_remote.py test_remote.py-20060720103555-yeeg2x51vn0rbtdp-2
------------------------------------------------------------
revno: 3377.2.19
revision-id: pqm at pqm.ubuntu.com-20080501070304-s4tdgkmt0ghea1i1
parent: pqm at pqm.ubuntu.com-20080501045531-3hkmq9qzoeequw1s
parent: mbp at sourcefrog.net-20080430085242-hdwj8zyp7m41vm41
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-05-01 08:03:04 +0100
message:
(mbp) Add symbol_versioning.deprecated_in
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3377.14.3
revision-id: mbp at sourcefrog.net-20080430085242-hdwj8zyp7m41vm41
parent: mbp at sourcefrog.net-20080430080517-bk00bm4j6jk3gcgn
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: deprecated-in
timestamp: Wed 2008-04-30 18:52:42 +1000
message:
Add deprecated_in to NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3377.14.2
revision-id: mbp at sourcefrog.net-20080430080517-bk00bm4j6jk3gcgn
parent: mbp at sourcefrog.net-20080430080411-imrex2wtwpb9eivj
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: controlfiles
timestamp: Wed 2008-04-30 18:05:17 +1000
message:
Add new symbol_versioning.deprecated_in
modified:
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
------------------------------------------------------------
revno: 3377.14.1
revision-id: mbp at sourcefrog.net-20080430080411-imrex2wtwpb9eivj
parent: pqm at pqm.ubuntu.com-20080428205328-bvr1g467xfx7rz9w
committer: Martin Pool <mbp at sourcefrog.net>
branch nick: controlfiles
timestamp: Wed 2008-04-30 18:04:11 +1000
message:
_format_version_tuple can take a 3-tuple
modified:
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
------------------------------------------------------------
revno: 3377.2.18
revision-id: pqm at pqm.ubuntu.com-20080501045531-3hkmq9qzoeequw1s
parent: pqm at pqm.ubuntu.com-20080430182230-iz5tit0t2ut5clww
parent: ian.clatworthy at canonical.com-20080430225840-d6qrnzxmvpw5v1jg
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Thu 2008-05-01 05:55:31 +0100
message:
Add Hooks.install_named_hook (Daniel Watkins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
------------------------------------------------------------
revno: 3377.13.1
revision-id: ian.clatworthy at canonical.com-20080430225840-d6qrnzxmvpw5v1jg
parent: pqm at pqm.ubuntu.com-20080430182230-iz5tit0t2ut5clww
parent: ian.clatworthy at canonical.com-20080430225647-7tr31njvvg6069t0
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: ianc-integration
timestamp: Thu 2008-05-01 08:58:40 +1000
message:
Add Hooks.install_named_hook (Daniel Watkins)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
------------------------------------------------------------
revno: 3256.2.32
revision-id: ian.clatworthy at canonical.com-20080430225647-7tr31njvvg6069t0
parent: d.m.watkins at warwick.ac.uk-20080430141438-w2y76ue4le5epcb6
committer: Ian Clatworthy <ian.clatworthy at canonical.com>
branch nick: hooks
timestamp: Thu 2008-05-01 08:56:47 +1000
message:
tweak hook tests to init the set_rh test when needed
modified:
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
------------------------------------------------------------
revno: 3256.2.31
revision-id: d.m.watkins at warwick.ac.uk-20080430141438-w2y76ue4le5epcb6
parent: d.m.watkins at warwick.ac.uk-20080430132137-8yqegd3xwbmvkuu9
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Wed 2008-04-30 15:14:38 +0100
message:
Removed needless line from tests.
modified:
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
------------------------------------------------------------
revno: 3256.2.30
revision-id: d.m.watkins at warwick.ac.uk-20080430132137-8yqegd3xwbmvkuu9
parent: d.m.watkins at warwick.ac.uk-20080430132107-k2juz6bdxj35xwpt
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Wed 2008-04-30 14:21:37 +0100
message:
Updated deprecation warnings and tests.
modified:
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
------------------------------------------------------------
revno: 3256.2.29
revision-id: d.m.watkins at warwick.ac.uk-20080430132107-k2juz6bdxj35xwpt
parent: d.m.watkins at warwick.ac.uk-20080430130249-fx1v1wtfr2lk0of3
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Wed 2008-04-30 14:21:07 +0100
message:
Added symbol_versioning.one_five.
modified:
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
------------------------------------------------------------
revno: 3256.2.28
revision-id: d.m.watkins at warwick.ac.uk-20080430130249-fx1v1wtfr2lk0of3
parent: d.m.watkins at warwick.ac.uk-20080423094652-ydbspc00j4oo20rb
parent: pqm at pqm.ubuntu.com-20080430065440-1l8693padc4f7uho
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Wed 2008-04-30 14:02:49 +0100
message:
Merged bzr.dev r3392.
added:
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
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/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
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/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
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/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-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/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
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_bundle.py test.py-20050630184834-092aa401ab9f039c
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_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
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: 3256.2.27
revision-id: d.m.watkins at warwick.ac.uk-20080423094652-ydbspc00j4oo20rb
parent: d.m.watkins at warwick.ac.uk-20080420082139-3273sz01qsc98ddj
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Wed 2008-04-23 10:46:52 +0100
message:
Fixed failing test.
modified:
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
------------------------------------------------------------
revno: 3256.2.26
revision-id: d.m.watkins at warwick.ac.uk-20080420082139-3273sz01qsc98ddj
parent: d.m.watkins at warwick.ac.uk-20080420080303-c8eosjjfyt8za2yf
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Sun 2008-04-20 09:21:39 +0100
message:
Updated tests to use install_named_hook.
modified:
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
------------------------------------------------------------
revno: 3256.2.25
revision-id: d.m.watkins at warwick.ac.uk-20080420080303-c8eosjjfyt8za2yf
parent: d.m.watkins at warwick.ac.uk-20080420074847-sioq6nbdqgnd4mzd
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Sun 2008-04-20 09:03:03 +0100
message:
Updated deprecation warnings.
modified:
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
------------------------------------------------------------
revno: 3256.2.24
revision-id: d.m.watkins at warwick.ac.uk-20080420074847-sioq6nbdqgnd4mzd
parent: d.m.watkins at warwick.ac.uk-20080420074829-awq07tyxg1r607tz
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Sun 2008-04-20 08:48:47 +0100
message:
Updated NEWS.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3256.2.23
revision-id: d.m.watkins at warwick.ac.uk-20080420074829-awq07tyxg1r607tz
parent: d.m.watkins at warwick.ac.uk-20080315005143-l00ao54gwri2pksm
parent: pqm at pqm.ubuntu.com-20080419002305-25ayhxp3m0b95e9c
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Sun 2008-04-20 08:48:29 +0100
message:
Merged bzr.dev r3374.
removed:
bzrlib/xml6.py xml6.py-20060823042456-dbaaq4atrche7xy5-1
added:
bzrlib/tests/test_mutabletree.py test_mutabletree.py-20080405014429-2v0cdi3re320p8db-1
bzrlib/tests/test_uncommit.py test_uncommit.py-20080316104338-y3gxu67g5m2qih10-1
bzrlib/tests/tree_implementations/test_annotate_iter.py test_annotate_iter.p-20080315092519-h4dc43rntmfmq16d-1
bzrlib/transport/nosmart.py nosmart.py-20080402095843-6ib17idympwy1zkr-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/tests/test_revisionnamespaces.py => bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/xml5.py => bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
README README-20050309040720-8f368abf9f346b9d
bzr bzr.py-20050313053754-5485f144c7006fa6
bzrlib/__init__.py __init__.py-20050309040759-33e65acf91bbcd5d
bzrlib/_knit_load_data_c.pyx knit_c.pyx-20070509143944-u42gy8w387a10m0j-1
bzrlib/_knit_load_data_py.py _knit_load_data_py.p-20070629000948-9a0nh4s118bi5y8n-1
bzrlib/annotate.py annotate.py-20050922133147-7c60541d2614f022
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/bugtracker.py bugtracker.py-20070410073305-vu1vu1qosjurg8kb-1
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/bundle/__init__.py changeset.py-20050513021216-b02ab57fb9738913
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/bzrdir.py bzrdir.py-20060131065624-156dfea39c4387cb
bzrlib/commands.py bzr.py-20050309040720-d10f4714595cf8c3
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
bzrlib/debug.py debug.py-20061102062349-vdhrw9qdpck8cl35-1
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/doc/api/__init__.py __init__.py-20051224020744-7b87d590843855bc
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/graph.py graph_walker.py-20070525030359-y852guab65d4wtn0-1
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/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/merge3.py merge3.py-20050704130834-bf0597094828a2e1
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/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
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/revision.py revision.py-20050309040759-e77802c08f3999d5
bzrlib/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/branch.py branch.py-20061124031907-mzh3pla28r83r97f-1
bzrlib/smart/bzrdir.py bzrdir.py-20061122024551-ol0l0o0oofsu9b3t-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/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/smart/request.py request.py-20061108095550-gunadhxmzkdjfeek-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/smart/vfs.py vfs.py-20061108095550-gunadhxmzkdjfeek-2
bzrlib/status.py status.py-20050505062338-431bfa63ec9b19e6
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
bzrlib/store/versioned/__init__.py weavestore.py-20050907094258-88262e0434babab9
bzrlib/symbol_versioning.py symbol_versioning.py-20060105104851-9ecf8af605d15a80
bzrlib/tests/TestUtil.py TestUtil.py-20050824080200-5f70140a2d938694
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_mv.py test_mv.py-20060705114902-33tkxz0o9cdshemo-1
bzrlib/tests/blackbox/test_pull.py test_pull.py-20051201144907-64959364f629947f
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-1
bzrlib/tests/blackbox/test_serve.py test_serve.py-20060913064329-8t2pvmsikl4s3xhl-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/blackbox/test_uncommit.py test_uncommit.py-20051027212835-84944b63adae51be
bzrlib/tests/blackbox/test_upgrade.py test_upgrade.py-20060120060132-b41e5ed2f886ad28
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
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/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/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
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_iter_reverse_revision_history.py test_iter_reverse_re-20070217015036-spu7j5ggch7pbpyd-1
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
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_annotate.py test_annotate.py-20061213215015-sttc9agsxomls7q0-1
bzrlib/tests/test_branch.py test_branch.py-20060116013032-97819aa07b8ab3b5
bzrlib/tests/test_bugtracker.py test_bugtracker.py-20070410073305-vu1vu1qosjurg8kb-2
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_bzrdir.py test_bzrdir.py-20060131065654-deba40eef51cf220
bzrlib/tests/test_commit.py test_commit.py-20050914060732-279f057f8c295434
bzrlib/tests/test_config.py testconfig.py-20051011041908-742d0c15d8d8c8eb
bzrlib/tests/test_diff.py testdiff.py-20050727164403-d1a3496ebb12e339
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_graph.py test_graph_walker.py-20070525030405-enq4r60hhi9xrujc-1
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_lazy_import.py test_lazy_import.py-20060910203832-f77c54gf3n232za0-2
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_merge3.py merge3.py-20050704130834-556689114c89e6f2
bzrlib/tests/test_osutils.py test_osutils.py-20051201224856-e48ee24c12182989
bzrlib/tests/test_plugins.py plugins.py-20050622075746-32002b55e5e943e9
bzrlib/tests/test_read_bundle.py test_read_bundle.py-20060615211421-ud8cwr1ulgd914zf-1
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_revision.py testrevision.py-20050804210559-46f5e1eb67b01289
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_status.py test_status.py-20060516190614-fbf6432e4a6e8aa5
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/test_subsume.py test_subsume.py-20060927040024-tsvh4pchajoayymg-1
bzrlib/tests/test_transport_implementations.py test_transport_implementations.py-20051227111451-f97c5c7d5c49fce7
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_versionedfile.py test_versionedfile.py-20060222045249-db45c9ed14a1c2e5
bzrlib/tests/test_weave.py testknit.py-20050627023648-9833cc5562ffb785
bzrlib/tests/test_wsgi.py test_wsgi.py-20061005091552-rz8pva0olkxv0sd8-1
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/tests/workingtree_implementations/test_locking.py test_locking.py-20060707151933-tav3o2hpibwi53u4-3
bzrlib/trace.py trace.py-20050309040759-c8ed824bdcd4748a
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/chroot.py chroot.py-20061011104729-0us9mgm97z378vnt-1
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/transport/http/__init__.py http_transport.py-20050711212304-506c5fd1059ace96
bzrlib/transport/http/_urllib2_wrappers.py _urllib2_wrappers.py-20060913231729-ha9ugi48ktx481ao-1
bzrlib/transport/http/wsgi.py wsgi.py-20061005091552-rz8pva0olkxv0sd8-2
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/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/ui/__init__.py ui.py-20050824083933-8cf663c763ba53a9
bzrlib/uncommit.py uncommit.py-20050626215513-5ec509fa425b305c
bzrlib/upgrade.py history2weaves.py-20050818063535-e7d319791c19a8b2
bzrlib/version.py version.py-20060816024207-ves6ult9a11taj9t-1
bzrlib/versionedfile.py versionedfile.py-20060222045106-5039c71ee3b65490
bzrlib/weave.py knit.py-20050627021749-759c29984154256b
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
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/developers/repository.txt repository.txt-20070709152006-xkhlek456eclha4u-1
doc/en/user-guide/annotating_changes.txt annotating_changes.t-20071122141511-0knao2lklsdsvb1q-1
doc/en/user-guide/bazaar_workflows.txt bazaar_workflows.txt-20071114035000-q36a9h57ps06uvnl-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/http_smart_server.txt fastcgi.txt-20061005091552-rz8pva0olkxv0sd8-3
doc/en/user-guide/installing_bazaar.txt installing_bazaar.tx-20071114035000-q36a9h57ps06uvnl-4
doc/en/user-guide/introducing_bazaar.txt introducing_bazaar.t-20071114035000-q36a9h57ps06uvnl-5
doc/en/user-guide/partner_intro.txt partner_workflow.txt-20071122141511-0knao2lklsdsvb1q-4
doc/en/user-guide/undoing_mistakes.txt undoing_mistakes.txt-20071121092300-8fyacngt1w98e5mp-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
bzrlib/tests/test_revisionspec.py testrevisionnamespaces.py-20050711050225-8b4af89e6b1efe84
bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
------------------------------------------------------------
revno: 3256.2.22
revision-id: d.m.watkins at warwick.ac.uk-20080315005143-l00ao54gwri2pksm
parent: d.m.watkins at warwick.ac.uk-20080311003851-3a01ooy9hrapdok4
parent: pqm at pqm.ubuntu.com-20080314225929-4y11nn6gml5qfzz1
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Sat 2008-03-15 00:51:43 +0000
message:
Merged bzr.dev r3278.
added:
bzrlib/directory_service.py directory_service.py-20080305221044-vr2mkvlsk8jypa2y-1
bzrlib/tests/blackbox/test_hooks.py test_hooks.py-20080308163236-xljgf9j41hik1x21-1
bzrlib/tests/test_directory_service.py test_directory_servi-20080305221044-vr2mkvlsk8jypa2y-2
doc/en/admin-guide/ docenadminguide-20080305135054-y7y2c986yf94zljn-1
doc/en/admin-guide/index.txt index.txt-20080305140741-ecw0lap8dxkxc05g-1
renamed:
bzrlib/plugins/launchpad/lp_indirect.py => bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_indirect.py => bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
modified:
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/delta.py delta.py-20050729221636-54cf14ef94783d0a
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
bzrlib/dirstate.py dirstate.py-20060728012006-d6mvoihjb3je9peu-1
bzrlib/errors.py errors.py-20050309040759-20512168c4e14fbd
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/mail_client.py mail_client.py-20070809192806-vuxt3t19srtpjpdn-1
bzrlib/merge.py merge.py-20050513021216-953b65a438527106
bzrlib/missing.py missing.py-20050812153334-097f7097e2a8bcd1
bzrlib/plugins/launchpad/__init__.py __init__.py-20060315182712-2d5feebd2a1032dc
bzrlib/plugins/launchpad/lp_registration.py lp_registration.py-20060315190948-daa617eafe3a8d48
bzrlib/registry.py lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-1
bzrlib/repofmt/pack_repo.py pack_repo.py-20070813041115-gjv5ma7ktfqwsjgn-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/smart/client.py client.py-20061116014825-2k6ada6xgulslami-1
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_merge.py test_merge.py-20060323225809-9bc0459c19917f41
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_send.py test_bundle.py-20060616222707-c21c8b7ea5ef57b1
bzrlib/tests/intertree_implementations/test_compare.py test_compare.py-20060724101752-09ysswo1a92uqyoz-2
bzrlib/tests/test_errors.py test_errors.py-20060210110251-41aba2deddf936a8
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_registry.py test_lazy_factory.py-20060809213415-2gfvqadtvdn0phtg-2
bzrlib/tests/test_transform.py test_transaction.py-20060105172520-b3ffb3946550e6c4
bzrlib/tests/test_upgrade.py test_upgrade.py-20051004040251-555fe1d2bae1bc71
bzrlib/tests/test_urlutils.py test_urlutils.py-20060502192900-46b1f9579987cf9c
bzrlib/tests/test_workingtree_4.py test_workingtree_4.p-20070223025758-531n3tznl3zacv2o-1
bzrlib/tests/workingtree_implementations/test_merge_from_branch.py test_merge_from_bran-20060904034200-12jxyk2zlhpufxe1-1
bzrlib/tests/workingtree_implementations/test_parents.py test_set_parents.py-20060807231740-yicmnlci1mj8smu1-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/transport/__init__.py transport.py-20050711165921-4978aa7ce1285ad5
bzrlib/transport/http/_urllib.py _urlgrabber.py-20060113083826-0bbf7d992fbf090c
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/urlutils.py urlutils.py-20060502195429-e8a161ecf8fac004
bzrlib/util/configobj/configobj.py configobj.py-20051018184548-06992a2246425e3e
bzrlib/util/configobj/docs/configobj.txt configobj.txt-20051018184548-4949b5f17e6a19c7
bzrlib/util/configobj/docs/validate.txt validate.txt-20051018184548-9e0e5ad913e258f5
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/lca-merge.txt lcamerge.txt-20080103061803-9isydn4ivgwrvorw-1
doc/en/mini-tutorial/index.txt index.txt-20070813141352-2u64ooqzo0or4hss-2
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
doc/en/user-guide/version_info.txt version_info.txt-20060921215543-gju6o5xdic8w25np-1
setup.py setup.py-20050314065409-02f8a0a6e3f9bc70
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/plugins/launchpad/test_lp_directory.py test_lp_indirect.py-20070126002743-oyle362tzv9cd8mi-1
------------------------------------------------------------
revno: 3256.2.21
revision-id: d.m.watkins at warwick.ac.uk-20080311003851-3a01ooy9hrapdok4
parent: d.m.watkins at warwick.ac.uk-20080310153522-fdqya6lftwouze0b
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Tue 2008-03-11 00:38:51 +0000
message:
Updated docs.
modified:
doc/en/user-guide/hooks.txt hooks.txt-20070829200551-7nr6e5a1io6x78uf-1
------------------------------------------------------------
revno: 3256.2.20
revision-id: d.m.watkins at warwick.ac.uk-20080310153522-fdqya6lftwouze0b
parent: d.m.watkins at warwick.ac.uk-20080310134303-usj73iopohe2bd6d
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Mon 2008-03-10 15:35:22 +0000
message:
Modified Hooks.install_hook tests to use applyDeprecated.
modified:
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
------------------------------------------------------------
revno: 3256.2.19
revision-id: d.m.watkins at warwick.ac.uk-20080310134303-usj73iopohe2bd6d
parent: d.m.watkins at warwick.ac.uk-20080310134038-5rklnc6o8ni2ap8q
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks-fix-deprecated
timestamp: Mon 2008-03-10 13:43:03 +0000
message:
Updated uses of Hooks.install_hook to Hooks.install_named_hook in tests.workingtree_implementations.test_commit.
modified:
bzrlib/tests/workingtree_implementations/test_commit.py test_commit.py-20060421013633-1610ec2331c8190f
------------------------------------------------------------
revno: 3256.2.18
revision-id: d.m.watkins at warwick.ac.uk-20080310134038-5rklnc6o8ni2ap8q
parent: d.m.watkins at warwick.ac.uk-20080310133731-x2s3yfgckgr4aaxq
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks-fix-deprecated
timestamp: Mon 2008-03-10 13:40:38 +0000
message:
Updated uses of Hooks.install_hook to Hooks.install_named_hook in tests.branch_implementation.test_commit.
modified:
bzrlib/tests/branch_implementations/test_commit.py test_commit.py-20070206022134-117z1i5b644p63r0-1
------------------------------------------------------------
revno: 3256.2.17
revision-id: d.m.watkins at warwick.ac.uk-20080310133731-x2s3yfgckgr4aaxq
parent: d.m.watkins at warwick.ac.uk-20080310133540-pmu0py1bjvmg998u
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks-fix-deprecated
timestamp: Mon 2008-03-10 13:37:31 +0000
message:
Updated uses of Hooks.install_hook to Hooks.install_named_hook in tests.branch_implementation.test_pull.
modified:
bzrlib/tests/branch_implementations/test_pull.py test_pull.py-20060410103942-83c35b26657414fc
------------------------------------------------------------
revno: 3256.2.16
revision-id: d.m.watkins at warwick.ac.uk-20080310133540-pmu0py1bjvmg998u
parent: d.m.watkins at warwick.ac.uk-20080310133305-1przied7hexdkftr
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks-fix-deprecated
timestamp: Mon 2008-03-10 13:35:40 +0000
message:
Updated uses of Hooks.install_hook to Hooks.install_named_hook in tests.branch_implementation.test_uncommit.
modified:
bzrlib/tests/branch_implementations/test_uncommit.py test_uncommit.py-20070205180410-ge7058d9138mvq3x-1
------------------------------------------------------------
revno: 3256.2.15
revision-id: d.m.watkins at warwick.ac.uk-20080310133305-1przied7hexdkftr
parent: d.m.watkins at warwick.ac.uk-20080310133029-46u2rppts9w67ehy
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks-fix-deprecated
timestamp: Mon 2008-03-10 13:33:05 +0000
message:
Updated uses of Hooks.install_hook to Hooks.install_named_hook in tests.branch_implementation.test_hooks.
modified:
bzrlib/tests/branch_implementations/test_hooks.py test_hooks.py-20070129154855-blhpwxmvjs07waei-1
------------------------------------------------------------
revno: 3256.2.14
revision-id: d.m.watkins at warwick.ac.uk-20080310133029-46u2rppts9w67ehy
parent: d.m.watkins at warwick.ac.uk-20080310132634-fy5vwnaqcbvr3lsj
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks-fix-deprecated
timestamp: Mon 2008-03-10 13:30:29 +0000
message:
Updated uses of Hooks.install_hook to Hooks.install_named_hook in tests.branch_implementation.test_push.
modified:
bzrlib/tests/branch_implementations/test_push.py test_push.py-20070130153159-fhfap8uoifevg30j-1
------------------------------------------------------------
revno: 3256.2.13
revision-id: d.m.watkins at warwick.ac.uk-20080310132634-fy5vwnaqcbvr3lsj
parent: d.m.watkins at warwick.ac.uk-20080310132241-b2ddachug9lejf2h
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks-fix-deprecated
timestamp: Mon 2008-03-10 13:26:34 +0000
message:
Updated uses of Hooks.install_hook to Hooks.install_named_hook in tests.transport_util.
modified:
bzrlib/tests/transport_util.py transportutil.py-20070525113600-5v2igk89s8fensom-1
------------------------------------------------------------
revno: 3256.2.12
revision-id: d.m.watkins at warwick.ac.uk-20080310132241-b2ddachug9lejf2h
parent: d.m.watkins at warwick.ac.uk-20080310001740-panxxd4p1d66tcm3
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks-fix-deprecated
timestamp: Mon 2008-03-10 13:22:41 +0000
message:
Updated uses of Hooks.install_hook to Hooks.install_named_hook in test_smart_transport.py.
modified:
bzrlib/tests/test_smart_transport.py test_ssh_transport.py-20060608202016-c25gvf1ob7ypbus6-2
------------------------------------------------------------
revno: 3256.2.11
revision-id: d.m.watkins at warwick.ac.uk-20080310001740-panxxd4p1d66tcm3
parent: d.m.watkins at warwick.ac.uk-20080310001524-t5afj5qfqyqihfzg
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Mon 2008-03-10 00:17:40 +0000
message:
Modified install_hook to call install_named_hook, as suggested by Aaron.
modified:
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
------------------------------------------------------------
revno: 3256.2.10
revision-id: d.m.watkins at warwick.ac.uk-20080310001524-t5afj5qfqyqihfzg
parent: d.m.watkins at warwick.ac.uk-20080308235856-nypvjpb7ezq3fpcg
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Mon 2008-03-10 00:15:24 +0000
message:
Tightened exception scope, as suggested by Aaron.
modified:
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
------------------------------------------------------------
revno: 3256.2.9
revision-id: d.m.watkins at warwick.ac.uk-20080308235856-nypvjpb7ezq3fpcg
parent: d.m.watkins at warwick.ac.uk-20080308233031-mteawtzna6l6spoe
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Sat 2008-03-08 23:58:56 +0000
message:
Added NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3256.2.8
revision-id: d.m.watkins at warwick.ac.uk-20080308233031-mteawtzna6l6spoe
parent: d.m.watkins at warwick.ac.uk-20080308232909-06819hqp4sdkqvam
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Sat 2008-03-08 23:30:31 +0000
message:
Alphabetised hooks.py.
modified:
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
------------------------------------------------------------
revno: 3256.2.7
revision-id: d.m.watkins at warwick.ac.uk-20080308232909-06819hqp4sdkqvam
parent: d.m.watkins at warwick.ac.uk-20080308232523-ymi4ju5jjdqypptr
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Sat 2008-03-08 23:29:09 +0000
message:
Deprecated Hooks.install_hook.
modified:
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
------------------------------------------------------------
revno: 3256.2.6
revision-id: d.m.watkins at warwick.ac.uk-20080308232523-ymi4ju5jjdqypptr
parent: d.m.watkins at warwick.ac.uk-20080308231536-t7h3ox4docehlfqa
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Sat 2008-03-08 23:25:23 +0000
message:
Added to tests.
modified:
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
------------------------------------------------------------
revno: 3256.2.5
revision-id: d.m.watkins at warwick.ac.uk-20080308231536-t7h3ox4docehlfqa
parent: d.m.watkins at warwick.ac.uk-20080308231452-zlso6a5iy2nclm2u
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Sat 2008-03-08 23:15:36 +0000
message:
Added install_named_hook.
modified:
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
------------------------------------------------------------
revno: 3256.2.4
revision-id: d.m.watkins at warwick.ac.uk-20080308231452-zlso6a5iy2nclm2u
parent: d.m.watkins at warwick.ac.uk-20080308224733-geod8arkvg1ipp8j
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Sat 2008-03-08 23:14:52 +0000
message:
Modified tests to reflect install_named_hook becoming a separate method.
modified:
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
------------------------------------------------------------
revno: 3256.2.3
revision-id: d.m.watkins at warwick.ac.uk-20080308224733-geod8arkvg1ipp8j
parent: d.m.watkins at warwick.ac.uk-20080308224713-3mhmgxtx6nxaosbw
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Sat 2008-03-08 22:47:33 +0000
message:
Added docs.
modified:
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
------------------------------------------------------------
revno: 3256.2.2
revision-id: d.m.watkins at warwick.ac.uk-20080308224713-3mhmgxtx6nxaosbw
parent: d.m.watkins at warwick.ac.uk-20080308224606-jnh2uvx51ibpvoxn
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Sat 2008-03-08 22:47:13 +0000
message:
Added option name parameter to install_hook.
modified:
bzrlib/hooks.py hooks.py-20070325015548-ix4np2q0kd8452au-1
------------------------------------------------------------
revno: 3256.2.1
revision-id: d.m.watkins at warwick.ac.uk-20080308224606-jnh2uvx51ibpvoxn
parent: pqm at pqm.ubuntu.com-20080307231150-h9ct4c51ekdiexbs
committer: Daniel Watkins <D.M.Watkins at warwick.ac.uk>
branch nick: hooks
timestamp: Sat 2008-03-08 22:46:06 +0000
message:
Added tests from Hooks.install_hook with an optional name parameter.
modified:
bzrlib/tests/test_hooks.py test_hooks.py-20070628030849-89rtsbe5dmer5npz-1
------------------------------------------------------------
revno: 3377.2.17
revision-id: pqm at pqm.ubuntu.com-20080430182230-iz5tit0t2ut5clww
parent: pqm at pqm.ubuntu.com-20080430161812-ns7wh4cab7ovfnsy
parent: john at arbash-meinel.com-20080430150249-viu4vgzglhfu7k7y
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-04-30 19:22:30 +0100
message:
(jam) 'bzr check' and 'bzr reconcile' will detect and repair
inconsistencies in branch revision-history, (bug #177855)
added:
bzrlib/tests/branch_implementations/test_check.py test_check.py-20080429151303-1sbfclxhddpz0tnj-1
bzrlib/tests/branch_implementations/test_reconcile.py test_reconcile.py-20080429161555-qlmccuyeyt6pvho7-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
------------------------------------------------------------
revno: 3377.12.8
revision-id: john at arbash-meinel.com-20080430150249-viu4vgzglhfu7k7y
parent: john at arbash-meinel.com-20080430133215-t1x69j3vg01yu3i0
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reconcile_rev_history_177855
timestamp: Wed 2008-04-30 10:02:49 -0500
message:
Update some tests to pass with the branch checks.
modified:
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
------------------------------------------------------------
revno: 3377.12.7
revision-id: john at arbash-meinel.com-20080430133215-t1x69j3vg01yu3i0
parent: john at arbash-meinel.com-20080429170124-13qtjqvwsd7mfldn
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reconcile_rev_history_177855
timestamp: Wed 2008-04-30 08:32:15 -0500
message:
Review comments from Ian
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
------------------------------------------------------------
revno: 3377.12.6
revision-id: john at arbash-meinel.com-20080429170124-13qtjqvwsd7mfldn
parent: john at arbash-meinel.com-20080429164314-n3q4obl92y7suwah
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reconcile_rev_history_177855
timestamp: Tue 2008-04-29 12:01:24 -0500
message:
minor fix to test file comment
modified:
bzrlib/tests/branch_implementations/test_check.py test_check.py-20080429151303-1sbfclxhddpz0tnj-1
------------------------------------------------------------
revno: 3377.12.5
revision-id: john at arbash-meinel.com-20080429164314-n3q4obl92y7suwah
parent: john at arbash-meinel.com-20080429163438-scr993idmrty20bv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reconcile_rev_history_177855
timestamp: Tue 2008-04-29 11:43:14 -0500
message:
Fix the line endings on test_check and test_reconcile
modified:
bzrlib/tests/branch_implementations/test_check.py test_check.py-20080429151303-1sbfclxhddpz0tnj-1
bzrlib/tests/branch_implementations/test_reconcile.py test_reconcile.py-20080429161555-qlmccuyeyt6pvho7-1
------------------------------------------------------------
revno: 3377.12.4
revision-id: john at arbash-meinel.com-20080429163438-scr993idmrty20bv
parent: john at arbash-meinel.com-20080429163158-hui1lprno5hd18pv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reconcile_rev_history_177855
timestamp: Tue 2008-04-29 11:34:38 -0500
message:
NEWS about fixing bug #177855
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3377.12.3
revision-id: john at arbash-meinel.com-20080429163158-hui1lprno5hd18pv
parent: john at arbash-meinel.com-20080429155330-4mb0y4xc8gb62tan
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reconcile_rev_history_177855
timestamp: Tue 2008-04-29 11:31:58 -0500
message:
Add Branch.reconcile() functionality.
added:
bzrlib/tests/branch_implementations/test_reconcile.py test_reconcile.py-20080429161555-qlmccuyeyt6pvho7-1
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
------------------------------------------------------------
revno: 3377.12.2
revision-id: john at arbash-meinel.com-20080429155330-4mb0y4xc8gb62tan
parent: john at arbash-meinel.com-20080429154714-iqrqt3dgg412ertk
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reconcile_rev_history_177855
timestamp: Tue 2008-04-29 10:53:30 -0500
message:
assert the right text is given in the error
modified:
bzrlib/tests/branch_implementations/test_check.py test_check.py-20080429151303-1sbfclxhddpz0tnj-1
------------------------------------------------------------
revno: 3377.12.1
revision-id: john at arbash-meinel.com-20080429154714-iqrqt3dgg412ertk
parent: pqm at pqm.ubuntu.com-20080429014232-4b86ax5pwynnf11i
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reconcile_rev_history_177855
timestamp: Tue 2008-04-29 10:47:14 -0500
message:
Add code to 'bzr check' to detect when the mainline history is inconsistent.
added:
bzrlib/tests/branch_implementations/test_check.py test_check.py-20080429151303-1sbfclxhddpz0tnj-1
modified:
bzrlib/branch.py branch.py-20050309040759-e4baf4e0d046576e
bzrlib/tests/branch_implementations/__init__.py __init__.py-20060123013057-b12a52c3f361daf4
bzrlib/tests/branch_implementations/test_branch.py testbranch.py-20050711070244-121d632bc37d7253
------------------------------------------------------------
revno: 3377.2.16
revision-id: pqm at pqm.ubuntu.com-20080430161812-ns7wh4cab7ovfnsy
parent: pqm at pqm.ubuntu.com-20080430065440-1l8693padc4f7uho
parent: john at arbash-meinel.com-20080429200228-ubbv2h0sqtrt0tsi
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-04-30 17:18:12 +0100
message:
(jam) Fix RemoteRepository.get_parent_map() when server is pre 1.2
(bug #214894)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3377.11.1
revision-id: john at arbash-meinel.com-20080429200228-ubbv2h0sqtrt0tsi
parent: pqm at pqm.ubuntu.com-20080429014232-4b86ax5pwynnf11i
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: remote_get_parent_map_214894
timestamp: Tue 2008-04-29 15:02:28 -0500
message:
Fix bug #214894. Fix RemoteRepository.get_parent_map() when server is <v1.2
When connecting to a server that is <v1.2, the get_parent_map() code falls back
to using get_revision_graph(). However, for nodes with no parents, get_revision_graph()
returns an empty tuple, while get_parent_map expects (NULL_REVISION,).
In get_parent_map() an empty tuple means the node is a ghost.
This caused problems pushing Branch5 branches, because it would check the revision history
and consider the first commit to be a ghost. Which meant it was excluded from the history.
And then len(revision_history) was always 1 shorter than the expected value.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
------------------------------------------------------------
revno: 3377.2.15
revision-id: pqm at pqm.ubuntu.com-20080430065440-1l8693padc4f7uho
parent: pqm at pqm.ubuntu.com-20080430034827-95gmd3iu0j7vrr5p
parent: aaron at aaronbentley.com-20080430045116-ge00vr9d5j9f2ca1
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-04-30 07:54:40 +0100
message:
(abentley) Fix fetch from non-rich-root to rich-root
added:
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
------------------------------------------------------------
revno: 3377.8.16
revision-id: aaron at aaronbentley.com-20080430045116-ge00vr9d5j9f2ca1
parent: aaron at aaronbentley.com-20080429162218-r6v6ergxxc6eesuo
parent: aaron at aaronbentley.com-20080430045058-qcw3x9bknel53vkq
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: make-it-right
timestamp: Wed 2008-04-30 00:51:16 -0400
message:
Merge with cleanup
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
------------------------------------------------------------
revno: 3377.10.5
revision-id: aaron at aaronbentley.com-20080430045058-qcw3x9bknel53vkq
parent: aaron at aaronbentley.com-20080429162204-vifcvgyeywb1vh87
parent: aaron at aaronbentley.com-20080430045030-vsw4qvpdkh5vp9yd
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: cleanup
timestamp: Wed 2008-04-30 00:50:58 -0400
message:
Merge with make-it-work
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
------------------------------------------------------------
revno: 3377.9.7
revision-id: aaron at aaronbentley.com-20080430045030-vsw4qvpdkh5vp9yd
parent: aaron at aaronbentley.com-20080429161740-qw8cjfqqhgm2sl8y
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: make-it-work
timestamp: Wed 2008-04-30 00:50:30 -0400
message:
Update docs
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
------------------------------------------------------------
revno: 3377.8.15
revision-id: aaron at aaronbentley.com-20080429162218-r6v6ergxxc6eesuo
parent: aaron at aaronbentley.com-20080429152014-wdr2jy5xw1nk1yov
parent: aaron at aaronbentley.com-20080429162204-vifcvgyeywb1vh87
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: make-it-right
timestamp: Tue 2008-04-29 12:22:18 -0400
message:
Merge cleanup
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
------------------------------------------------------------
revno: 3377.10.4
revision-id: aaron at aaronbentley.com-20080429162204-vifcvgyeywb1vh87
parent: aaron at aaronbentley.com-20080429151942-s48lj1yj8q0xxkak
parent: aaron at aaronbentley.com-20080429161740-qw8cjfqqhgm2sl8y
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: cleanup
timestamp: Tue 2008-04-29 12:22:04 -0400
message:
Merge make-it-work
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
------------------------------------------------------------
revno: 3377.9.6
revision-id: aaron at aaronbentley.com-20080429161740-qw8cjfqqhgm2sl8y
parent: aaron at aaronbentley.com-20080429151403-r1ak2ew0mdp30o53
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: make-it-work
timestamp: Tue 2008-04-29 12:17:40 -0400
message:
Remove versionedfile
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
------------------------------------------------------------
revno: 3377.8.14
revision-id: aaron at aaronbentley.com-20080429152014-wdr2jy5xw1nk1yov
parent: aaron at aaronbentley.com-20080428040005-pe3ro8w6qwrsvs2u
parent: aaron at aaronbentley.com-20080429151942-s48lj1yj8q0xxkak
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: make-it-right
timestamp: Tue 2008-04-29 11:20:14 -0400
message:
merge with cleanup
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/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/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-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_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3377.10.3
revision-id: aaron at aaronbentley.com-20080429151942-s48lj1yj8q0xxkak
parent: aaron at aaronbentley.com-20080428034107-rmyfgikhoyk3s5z7
parent: aaron at aaronbentley.com-20080429151403-r1ak2ew0mdp30o53
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: cleanup
timestamp: Tue 2008-04-29 11:19:42 -0400
message:
Merge with 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/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/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-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_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3377.9.5
revision-id: aaron at aaronbentley.com-20080429151403-r1ak2ew0mdp30o53
parent: aaron at aaronbentley.com-20080429150723-eqd5di6s1cr14q3g
parent: pqm at pqm.ubuntu.com-20080429014232-4b86ax5pwynnf11i
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: make-it-work
timestamp: Tue 2008-04-29 11:14:03 -0400
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/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-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_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3377.9.4
revision-id: aaron at aaronbentley.com-20080429150723-eqd5di6s1cr14q3g
parent: aaron at aaronbentley.com-20080428034047-x3cuymv3k0qjjkrp
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: make-it-work
timestamp: Tue 2008-04-29 11:07:23 -0400
message:
Updates from review
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
------------------------------------------------------------
revno: 3377.8.13
revision-id: aaron at aaronbentley.com-20080428040005-pe3ro8w6qwrsvs2u
parent: aaron at aaronbentley.com-20080428035556-w8hv8dv6vo5k3j6i
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: make-it-right
timestamp: Mon 2008-04-28 00:00:05 -0400
message:
Fix normal revision installation
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
------------------------------------------------------------
revno: 3377.8.12
revision-id: aaron at aaronbentley.com-20080428035556-w8hv8dv6vo5k3j6i
parent: aaron at aaronbentley.com-20080428034134-wzqqujphjdpo9by1
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: make-it-right
timestamp: Sun 2008-04-27 23:55:56 -0400
message:
fix test
modified:
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 3377.8.11
revision-id: aaron at aaronbentley.com-20080428034134-wzqqujphjdpo9by1
parent: aaron at aaronbentley.com-20080428015309-nwp7iwqk16ie8sh5
parent: aaron at aaronbentley.com-20080428034107-rmyfgikhoyk3s5z7
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: make-it-right
timestamp: Sun 2008-04-27 23:41:34 -0400
message:
Merge with cleanup
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: 3377.10.2
revision-id: aaron at aaronbentley.com-20080428034107-rmyfgikhoyk3s5z7
parent: aaron at aaronbentley.com-20080428014746-tz4zai2cqhyoc0u2
parent: aaron at aaronbentley.com-20080428034047-x3cuymv3k0qjjkrp
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: cleanup
timestamp: Sun 2008-04-27 23:41:07 -0400
message:
Merge with make-it-work
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: 3377.9.3
revision-id: aaron at aaronbentley.com-20080428034047-x3cuymv3k0qjjkrp
parent: aaron at aaronbentley.com-20080428014729-h1uc6156xx9te4m4
parent: pqm at pqm.ubuntu.com-20080428032913-4fgik9du2kpxl8sf
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: make-it-work
timestamp: Sun 2008-04-27 23:40:47 -0400
message:
Merge with bzr.dev
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: 3377.8.10
revision-id: aaron at aaronbentley.com-20080428015309-nwp7iwqk16ie8sh5
parent: aaron at aaronbentley.com-20080428015242-5yrgim0qs6cvqf1l
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: make-it-right
timestamp: Sun 2008-04-27 21:53:09 -0400
message:
Update NEWS
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3377.8.9
revision-id: aaron at aaronbentley.com-20080428015242-5yrgim0qs6cvqf1l
parent: aaron at aaronbentley.com-20080428004940-hipydum9ucwsc0qu
parent: aaron at aaronbentley.com-20080428014746-tz4zai2cqhyoc0u2
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: make-it-right
timestamp: Sun 2008-04-27 21:52:42 -0400
message:
Merge with cleanups
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 3377.10.1
revision-id: aaron at aaronbentley.com-20080428014746-tz4zai2cqhyoc0u2
parent: aaron at aaronbentley.com-20080427223542-251if36avw98tauo
parent: aaron at aaronbentley.com-20080428014729-h1uc6156xx9te4m4
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: cleanup
timestamp: Sun 2008-04-27 21:47:46 -0400
message:
Merge make-it-work
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 3377.9.2
revision-id: aaron at aaronbentley.com-20080428014729-h1uc6156xx9te4m4
parent: aaron at aaronbentley.com-20080427222948-hd5kcqx6157xq5on
parent: pqm at pqm.ubuntu.com-20080428012318-g5zq9wl2flua3r2s
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: make-it-work
timestamp: Sun 2008-04-27 21:47:29 -0400
message:
Merge bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
------------------------------------------------------------
revno: 3377.8.8
revision-id: aaron at aaronbentley.com-20080428004940-hipydum9ucwsc0qu
parent: aaron at aaronbentley.com-20080428004710-gd8t8y6rgq38wy38
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: make-it-right
timestamp: Sun 2008-04-27 20:49:40 -0400
message:
Test that the stored inventory hash is correct when bundles are used
modified:
bzrlib/bundle/serializer/v4.py v10.py-20070611062757-5ggj7k18s9dej0fr-1
bzrlib/tests/test_bundle.py test.py-20050630184834-092aa401ab9f039c
------------------------------------------------------------
revno: 3377.8.7
revision-id: aaron at aaronbentley.com-20080428004710-gd8t8y6rgq38wy38
parent: aaron at aaronbentley.com-20080427234745-vng2ghxfnjqmmksc
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: make-it-right
timestamp: Sun 2008-04-27 20:47:10 -0400
message:
Remove bogus bundle validation
modified:
bzrlib/bundle/bundle_data.py read_changeset.py-20050619171944-c0d95aa685537640
------------------------------------------------------------
revno: 3377.8.6
revision-id: aaron at aaronbentley.com-20080427234745-vng2ghxfnjqmmksc
parent: aaron at aaronbentley.com-20080427223542-251if36avw98tauo
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: make-it-right
timestamp: Sun 2008-04-27 19:47:45 -0400
message:
Ensure fetching munges sha1s
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
------------------------------------------------------------
revno: 3377.8.5
revision-id: aaron at aaronbentley.com-20080427223542-251if36avw98tauo
parent: aaron at aaronbentley.com-20080425213659-efe3yt7x3sxaplkn
parent: aaron at aaronbentley.com-20080427222948-hd5kcqx6157xq5on
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: cleanup
timestamp: Sun 2008-04-27 18:35:42 -0400
message:
Merge with make-it-work
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
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/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
bzrlib/smart/repository.py repository.py-20061128022038-vr5wy5bubyb8xttk-1
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
bzrlib/tests/repository_implementations/test_repository.py test_repository.py-20060131092128-ad07f494f5c9d26c
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
------------------------------------------------------------
revno: 3377.9.1
revision-id: aaron at aaronbentley.com-20080427222948-hd5kcqx6157xq5on
parent: aaron at aaronbentley.com-20080425131627-i2kuaqo6fu74hj8e
parent: pqm at pqm.ubuntu.com-20080427070204-4t5flfqnnmr6bmiw
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: make-it-work
timestamp: Sun 2008-04-27 18:29:48 -0400
message:
Merge with bzr.dev
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/diff.py diff.py-20050309040759-26944fbbf2ebbf36
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/revisionspec.py revisionspec.py-20050907152633-17567659fd5c0ddb
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: 3377.8.4
revision-id: aaron at aaronbentley.com-20080425213659-efe3yt7x3sxaplkn
parent: aaron at aaronbentley.com-20080425131627-i2kuaqo6fu74hj8e
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: cleanup
timestamp: Fri 2008-04-25 17:36:59 -0400
message:
Split interrepository fetch tests into their own file
added:
bzrlib/tests/interrepository_implementations/test_fetch.py test_fetch.py-20080425213627-j60cjh782ufm83ry-1
modified:
bzrlib/tests/interrepository_implementations/__init__.py __init__.py-20060220054744-baf49a1f88f17b1a
bzrlib/tests/interrepository_implementations/test_interrepository.py test_interrepository.py-20060220061411-1ec13fa99e5e3eee
------------------------------------------------------------
revno: 3377.8.3
revision-id: aaron at aaronbentley.com-20080425131627-i2kuaqo6fu74hj8e
parent: aaron at aaronbentley.com-20080425042959-smj8skzokwe8kbxt
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: fetch1to2
timestamp: Fri 2008-04-25 09:16:27 -0400
message:
Fix model-change fetching with ghosts and when fetch is resumed
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
------------------------------------------------------------
revno: 3377.8.2
revision-id: aaron at aaronbentley.com-20080425042959-smj8skzokwe8kbxt
parent: aaron at aaronbentley.com-20080425022747-4euksn81ffolid60
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: fetch1to2
timestamp: Fri 2008-04-25 00:29:59 -0400
message:
Improve handling ghosts and changing root_ids
modified:
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
------------------------------------------------------------
revno: 3377.8.1
revision-id: aaron at aaronbentley.com-20080425022747-4euksn81ffolid60
parent: pqm at pqm.ubuntu.com-20080424185721-ukk0dncnc4xpqk5o
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: fetch1to2
timestamp: Thu 2008-04-24 22:27:47 -0400
message:
Fix inventory insertion to work in topological order
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/tests/test_fetch.py testfetch.py-20050825090644-f73e07e7dfb1765a
------------------------------------------------------------
revno: 3377.2.14
revision-id: pqm at pqm.ubuntu.com-20080430034827-95gmd3iu0j7vrr5p
parent: pqm at pqm.ubuntu.com-20080429155137-0w5littcl831pq4m
parent: aaron at aaronbentley.com-20080429191340-q0azlwbx2gha7m18
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2008-04-30 04:48:27 +0100
message:
(abentley) speed up no-op pull
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 1551.19.42
revision-id: aaron at aaronbentley.com-20080429191340-q0azlwbx2gha7m18
parent: aaron at aaronbentley.com-20080429175350-175taqt31h3v8der
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2008-04-29 15:13:40 -0400
message:
Add lock around branch pull
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 1551.19.41
revision-id: aaron at aaronbentley.com-20080429175350-175taqt31h3v8der
parent: aaron at aaronbentley.com-20080429175137-ydw4zwn5fsf8g8pj
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2008-04-29 13:53:50 -0400
message:
Accelerate no-op pull
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
------------------------------------------------------------
revno: 1551.19.40
revision-id: aaron at aaronbentley.com-20080429175137-ydw4zwn5fsf8g8pj
parent: aaron at aaronbentley.com-20080428224739-1n5u92ht05c1hx2d
parent: pqm at pqm.ubuntu.com-20080429155137-0w5littcl831pq4m
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: Aaron's mergeable stuff
timestamp: Tue 2008-04-29 13:51:37 -0400
message:
Merge with 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/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-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_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3377.2.13
revision-id: pqm at pqm.ubuntu.com-20080429155137-0w5littcl831pq4m
parent: pqm at pqm.ubuntu.com-20080429014232-4b86ax5pwynnf11i
parent: andrew.bennetts at canonical.com-20080429134340-c5ef1fxrptoynikx
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-04-29 16:51:37 +0100
message:
Add optional thread_name_suffix parameter to
SmartTCPServer_for_testing. (Andrew Bennetts)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3377.7.1
revision-id: andrew.bennetts at canonical.com-20080429134340-c5ef1fxrptoynikx
parent: pqm at pqm.ubuntu.com-20080428083317-x033hd0yn73mqaj7
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: thread-name-suffix
timestamp: Tue 2008-04-29 23:43:40 +1000
message:
Add optional thread_name_suffix parameter to SmartTCPServer.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
------------------------------------------------------------
revno: 3377.2.12
revision-id: pqm at pqm.ubuntu.com-20080429014232-4b86ax5pwynnf11i
parent: pqm at pqm.ubuntu.com-20080428205328-bvr1g467xfx7rz9w
parent: aaron at aaronbentley.com-20080428224739-1n5u92ht05c1hx2d
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-04-29 02:42:32 +0100
message:
(abentley) Improve 'uncommit' documentation
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 1551.19.39
revision-id: aaron at aaronbentley.com-20080428224739-1n5u92ht05c1hx2d
parent: aaron at aaronbentley.com-20080428012745-n6x7a8cymzkswbtv
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: Aaron's mergeable stuff
timestamp: Mon 2008-04-28 18:47:39 -0400
message:
Update 'uncommit' docs
modified:
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
------------------------------------------------------------
revno: 3377.2.11
revision-id: pqm at pqm.ubuntu.com-20080428205328-bvr1g467xfx7rz9w
parent: pqm at pqm.ubuntu.com-20080428184356-qic5mhqzrgxlwwhs
parent: aaron at aaronbentley.com-20080428185055-642va5h5n13j8mxw
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-04-28 21:53:28 +0100
message:
(abentley) correct _PreviewTree testing merge
modified:
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3363.3.5
revision-id: aaron at aaronbentley.com-20080428185055-642va5h5n13j8mxw
parent: aaron at aaronbentley.com-20080428163729-vj9c0vf7rqkliani
parent: aaron at aaronbentley.com-20080428030701-5axl03chky7p1qg9
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree
timestamp: Mon 2008-04-28 14:50:55 -0400
message:
Revert changes in preview-tree-changes
------------------------------------------------------------
revno: 3363.3.4
revision-id: aaron at aaronbentley.com-20080428163729-vj9c0vf7rqkliani
parent: aaron at aaronbentley.com-20080428162835-vvhly03zcvfyo6gd
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree
timestamp: Mon 2008-04-28 12:37:29 -0400
message:
Add get_file_size to Tree interface
modified:
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/tree.py tree.py-20050309040759-9d5f2496be663e77
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
bzrlib/workingtree_4.py workingtree_4.py-20070208044105-5fgpc5j3ljlh5q6c-1
------------------------------------------------------------
revno: 3363.3.3
revision-id: aaron at aaronbentley.com-20080428162835-vvhly03zcvfyo6gd
parent: aaron at aaronbentley.com-20080428030347-j81zva7jb3tcg889
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree
timestamp: Mon 2008-04-28 12:28:35 -0400
message:
Updates from review
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3377.2.10
revision-id: pqm at pqm.ubuntu.com-20080428184356-qic5mhqzrgxlwwhs
parent: pqm at pqm.ubuntu.com-20080428083317-x033hd0yn73mqaj7
parent: aaron at aaronbentley.com-20080428030701-5axl03chky7p1qg9
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-04-28 19:43:56 +0100
message:
(abentley) Get _PreviewTree under test
modified:
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3363.2.11
revision-id: aaron at aaronbentley.com-20080428030701-5axl03chky7p1qg9
parent: aaron at aaronbentley.com-20080413223554-3i4daoy80ooqvdz2
parent: aaron at aaronbentley.com-20080428030347-j81zva7jb3tcg889
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree-changed
timestamp: Sun 2008-04-27 23:07:01 -0400
message:
Merge with preview-tree
removed:
bzrlib/tests/tree_implementations/test_inv_alternatives.py test_inv_alternative-20080412183215-pjhfu9bxgasz3orh-1
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/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/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
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/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
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/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/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/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-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_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
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/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
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
bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
------------------------------------------------------------
revno: 3363.3.2
revision-id: aaron at aaronbentley.com-20080428030347-j81zva7jb3tcg889
parent: aaron at aaronbentley.com-20080428030242-7pc7ce0c1trnsnxv
parent: pqm at pqm.ubuntu.com-20080428012318-g5zq9wl2flua3r2s
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree
timestamp: Sun 2008-04-27 23:03:47 -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/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/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/config.py config.py-20051011043216-070c74f4e9e338e8
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/help_topics/en/configuration.txt configuration.txt-20060314161707-868350809502af01
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/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/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/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
bzrlib/tests/blackbox/test_reconfigure.py test_reconfigure.py-20070908173426-khfo5fi2rgzgtwj3-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_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_mail_client.py test_mail_client.py-20070809192806-vuxt3t19srtpjpdn-2
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
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/test_xml.py test_xml.py-20050905091053-80b45588931a9b35
bzrlib/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
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
bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
------------------------------------------------------------
revno: 3363.3.1
revision-id: aaron at aaronbentley.com-20080428030242-7pc7ce0c1trnsnxv
parent: aaron at aaronbentley.com-20080413210615-9341l9rt0fnezvpn
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree
timestamp: Sun 2008-04-27 23:02:42 -0400
message:
Combine test_inv_alternatives and test_inv
removed:
bzrlib/tests/tree_implementations/test_inv_alternatives.py test_inv_alternative-20080412183215-pjhfu9bxgasz3orh-1
modified:
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
------------------------------------------------------------
revno: 3363.2.10
revision-id: aaron at aaronbentley.com-20080413223554-3i4daoy80ooqvdz2
parent: aaron at aaronbentley.com-20080413210615-9341l9rt0fnezvpn
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree-changed
timestamp: Sun 2008-04-13 18:35:54 -0400
message:
Refactor _prepare_revert_transform out of revert
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.2.9
revision-id: aaron at aaronbentley.com-20080413210615-9341l9rt0fnezvpn
parent: aaron at aaronbentley.com-20080412205828-eooqv88548wcbl1l
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree
timestamp: Sun 2008-04-13 17:06:15 -0400
message:
Fix up some refactorings
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.2.8
revision-id: aaron at aaronbentley.com-20080412205828-eooqv88548wcbl1l
parent: aaron at aaronbentley.com-20080412194313-qtygleydrwk8tfz7
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree
timestamp: Sat 2008-04-12 16:58:28 -0400
message:
All tests passing
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.2.7
revision-id: aaron at aaronbentley.com-20080412194313-qtygleydrwk8tfz7
parent: aaron at aaronbentley.com-20080412181107-t14j2lxb8acxdnlr
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree
timestamp: Sat 2008-04-12 15:43:13 -0400
message:
Implement alterntative-to-inventory tests
added:
bzrlib/tests/tree_implementations/test_inv_alternatives.py test_inv_alternative-20080412183215-pjhfu9bxgasz3orh-1
modified:
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/tree_implementations/test_inv.py test_inv.py-20070312023226-0cdvk5uwhutis9vg-1
bzrlib/tests/tree_implementations/test_test_trees.py test_tree_trees.py-20060720091921-3nwi5h21lf06vf5p-1
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
bzrlib/workingtree.py workingtree.py-20050511021032-29b6ec0a681e02e3
------------------------------------------------------------
revno: 3363.2.6
revision-id: aaron at aaronbentley.com-20080412181107-t14j2lxb8acxdnlr
parent: aaron at aaronbentley.com-20080412180956-1x4hw9gp4xsssgsr
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree
timestamp: Sat 2008-04-12 14:11:07 -0400
message:
Fix adatation test
modified:
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
revno: 3363.2.5
revision-id: aaron at aaronbentley.com-20080412180956-1x4hw9gp4xsssgsr
parent: aaron at aaronbentley.com-20080411221115-fg6fpa16ay4dco3a
parent: aaron at aaronbentley.com-20080412060329-qprwz8yqyxkp2m09
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree
timestamp: Sat 2008-04-12 14:09:56 -0400
message:
Merge from refactor-intertree
modified:
bzrlib/tests/intertree_implementations/__init__.py __init__.py-20060724101752-09ysswo1a92uqyoz-3
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
bzrlib/tests/workingtree_implementations/__init__.py __init__.py-20060203003124-b2aa5aca21a8bfad
------------------------------------------------------------
revno: 3363.2.4
revision-id: aaron at aaronbentley.com-20080411221115-fg6fpa16ay4dco3a
parent: aaron at aaronbentley.com-20080411194738-g1j30d0j9sv4s2u1
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree
timestamp: Fri 2008-04-11 18:11:15 -0400
message:
Get significant portions of PreviewTree implemented and passing tests
modified:
bzrlib/transform.py transform.py-20060105172343-dd99e54394d91687
------------------------------------------------------------
revno: 3363.2.3
revision-id: aaron at aaronbentley.com-20080411194738-g1j30d0j9sv4s2u1
parent: aaron at aaronbentley.com-20080411193701-oqfs6tvwaycyr9a7
parent: aaron at aaronbentley.com-20080411194715-tmr73uvu8ycyoo4r
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree
timestamp: Fri 2008-04-11 15:47:38 -0400
message:
Merge with lower thread
modified:
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
------------------------------------------------------------
revno: 3363.2.2
revision-id: aaron at aaronbentley.com-20080411193701-oqfs6tvwaycyr9a7
parent: aaron at aaronbentley.com-20080411193607-14nbd5258sss9o7m
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree
timestamp: Fri 2008-04-11 15:37:01 -0400
message:
Add PreviewTree pre scenarios
modified:
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
------------------------------------------------------------
revno: 3363.2.1
revision-id: aaron at aaronbentley.com-20080411193607-14nbd5258sss9o7m
parent: aaron at aaronbentley.com-20080411191850-g4h43o2d8dwpqmco
parent: aaron at aaronbentley.com-20080411193418-lzpzicebh5is2nd7
committer: Aaron Bentley <aaron at aaronbentley.com>
branch nick: preview-tree
timestamp: Fri 2008-04-11 15:36:07 -0400
message:
Merge converter parameter usage
modified:
bzrlib/tests/tree_implementations/__init__.py __init__.py-20060717075546-420s7b0bj9hzeowi-2
------------------------------------------------------------
revno: 3377.2.9
revision-id: pqm at pqm.ubuntu.com-20080428083317-x033hd0yn73mqaj7
parent: pqm at pqm.ubuntu.com-20080428055446-p0m8jwv1jzegn933
parent: andrew.bennetts at canonical.com-20080428062416-f7niegy7ekq4oftx
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Mon 2008-04-28 09:33:17 +0100
message:
Merge final tweak of fix for error about "attempt to add line-delta
in non-delta knit". (Andrew Bennetts)
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3370.1.10
revision-id: andrew.bennetts at canonical.com-20080428062416-f7niegy7ekq4oftx
parent: andrew.bennetts at canonical.com-20080428055807-qfx4kdbgl3tg2zng
parent: pqm at pqm.ubuntu.com-20080428055446-p0m8jwv1jzegn933
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bug-217701
timestamp: Mon 2008-04-28 16:24:16 +1000
message:
Merge from 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/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/tests/blackbox/test_version.py test_version.py-20070312060045-ol7th9z035r3im3d-1
bzrlib/tests/test_store.py teststore.py-20050826022702-f6caadb647395769
doc/developers/HACKING.txt HACKING-20050805200004-2a5dc975d870f78c
------------------------------------------------------------
revno: 3370.1.9
revision-id: andrew.bennetts at canonical.com-20080428055807-qfx4kdbgl3tg2zng
parent: andrew.bennetts at canonical.com-20080428055606-gu9izdt55qe9t7gn
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bug-217701
timestamp: Mon 2008-04-28 15:58:07 +1000
message:
Add NEWS entry.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
------------------------------------------------------------
revno: 3370.1.8
revision-id: andrew.bennetts at canonical.com-20080428055606-gu9izdt55qe9t7gn
parent: andrew.bennetts at canonical.com-20080428054637-w1t3l02zixduk0fr
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bug-217701
timestamp: Mon 2008-04-28 15:56:06 +1000
message:
Extract a _convert_line_delta_to_fulltext helper.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
------------------------------------------------------------
revno: 3370.1.7
revision-id: andrew.bennetts at canonical.com-20080428054637-w1t3l02zixduk0fr
parent: andrew.bennetts at canonical.com-20080418064515-wnqz648mpegu5x60
parent: pqm at pqm.ubuntu.com-20080428032913-4fgik9du2kpxl8sf
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bug-217701
timestamp: Mon 2008-04-28 15:46:37 +1000
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
renamed:
bzrlib/xml5.py => bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
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/log.py log.py-20050505065812-c40ce11702fe5fb1
bzrlib/msgeditor.py msgeditor.py-20050901111708-ef6d8de98f5d8f2f
bzrlib/plugins/launchpad/lp_directory.py lp_indirect.py-20070126012204-de5rugwlt22c7u7e-1
bzrlib/reconfigure.py reconfigure.py-20070908040425-6ykgo7escxhyrg9p-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/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
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/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_log.py testlog.py-20050728115707-1a514809d7d49309
bzrlib/tests/test_reconfigure.py test_reconfigure.py-20070908040425-6ykgo7escxhyrg9p-2
bzrlib/tests/test_repository.py test_repository.py-20060131075918-65c555b881612f4d
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
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/transport/ftp.py ftp.py-20051116161804-58dc9506548c2a53
bzrlib/xml_serializer.py xml.py-20050309040759-57d51586fdec365d
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
bzrlib/xml8.py xml5.py-20050907032657-aac8f960815b66b1
------------------------------------------------------------
revno: 3370.1.6
revision-id: andrew.bennetts at canonical.com-20080418064515-wnqz648mpegu5x60
parent: andrew.bennetts at canonical.com-20080418064431-23iqugpuy08jb20m
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bug-217701
timestamp: Fri 2008-04-18 16:45:15 +1000
message:
Add test for line-deltas inserted into a non-delta knit.
modified:
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
------------------------------------------------------------
revno: 3370.1.5
revision-id: andrew.bennetts at canonical.com-20080418064431-23iqugpuy08jb20m
parent: andrew.bennetts at canonical.com-20080418063545-y3qafi033t4c6gfg
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bug-217701
timestamp: Fri 2008-04-18 16:44:31 +1000
message:
Rename test methods to be a little clearer after reorganisation.
modified:
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
------------------------------------------------------------
revno: 3370.1.4
revision-id: andrew.bennetts at canonical.com-20080418063545-y3qafi033t4c6gfg
parent: andrew.bennetts at canonical.com-20080418061729-wpw12iplmar8ot8s
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bug-217701
timestamp: Fri 2008-04-18 16:35:45 +1000
message:
Organise data stream tests in test_knit slightly better.
modified:
bzrlib/tests/test_knit.py test_knit.py-20051212171302-95d4c00dd5f11f2b
------------------------------------------------------------
revno: 3370.1.3
revision-id: andrew.bennetts at canonical.com-20080418061729-wpw12iplmar8ot8s
parent: andrew.bennetts at canonical.com-20080418060508-cy5uqu8gn4e62qki
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bug-217701
timestamp: Fri 2008-04-18 16:17:29 +1000
message:
Add a comment.
modified:
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
------------------------------------------------------------
revno: 3370.1.2
revision-id: andrew.bennetts at canonical.com-20080418060508-cy5uqu8gn4e62qki
parent: andrew.bennetts at canonical.com-20080418021607-1fwitfz49w32vjmo
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bug-217701
timestamp: Fri 2008-04-18 16:05:08 +1000
message:
Always ensure that 'revisions' versioned file in a knit store is non-delta.
modified:
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
bzrlib/store/revision/knit.py knit.py-20060303020652-de5fa299e941a3c7
------------------------------------------------------------
revno: 3370.1.1
revision-id: andrew.bennetts at canonical.com-20080418021607-1fwitfz49w32vjmo
parent: pqm at pqm.ubuntu.com-20080416172809-mq3p3rm6q3vefyyz
committer: Andrew Bennetts <andrew.bennetts at canonical.com>
branch nick: bug-217701
timestamp: Fri 2008-04-18 12:16:07 +1000
message:
Tentative fix for 217701.
modified:
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/repofmt/knitrepo.py knitrepo.py-20070206081537-pyy4a00xdas0j4pf-1
------------------------------------------------------------
revno: 3377.2.8
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: 3377.6.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: 3360.3.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: 3360.2.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: 3360.2.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: 3360.2.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: 3360.2.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: 3360.2.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: 3360.2.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: 3360.3.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: 3360.2.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: 3360.3.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: 3360.2.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: 3360.2.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: 3346.2.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: 3346.2.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: 3346.2.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: 3346.2.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: 3346.2.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: 3346.2.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: 3346.2.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: 3346.2.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: 3346.2.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: 3360.2.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: 3360.2.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: 3377.2.7
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: 3377.2.6
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: 3377.5.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: 3377.2.5
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: 3377.4.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: 3377.4.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: 3377.4.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: 3377.4.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: 3377.2.4
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: 3377.2.3
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: 3338.1.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: 3338.1.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: 3338.1.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: 3338.1.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: 3338.1.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: 3377.2.2
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: 3377.3.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: 3377.3.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: 3377.2.1
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: 3377.1.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: 3373.3.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 (4297 lines, the limit is 1000).
More information about the bazaar-commits
mailing list