Rev 3342: merge bzr.dev in file:///v/home/vila/src/bzr/experimental/faster-selftest/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Wed Apr 30 22:32:47 BST 2008
At file:///v/home/vila/src/bzr/experimental/faster-selftest/
------------------------------------------------------------
revno: 3342
revision-id: v.ladeuil+lp at free.fr-20080430213235-tgn24ahe6dwwyy7j
parent: v.ladeuil+lp at free.fr-20080428092027-9aqt6qjvtuvxf5uu
parent: v.ladeuil+lp at free.fr-20080430200939-onep1tu7d1t2y0ld
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: selftest-starts-with
timestamp: Wed 2008-04-30 23:32:35 +0200
message:
merge bzr.dev
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:
NEWS NEWS-20050323055033-4e00b5db738777ff
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/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
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/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
bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
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
------------------------------------------------------------
revno: 3338.1.3
revision-id: v.ladeuil+lp at free.fr-20080430200939-onep1tu7d1t2y0ld
parent: v.ladeuil+lp at free.fr-20080428085745-bxrf007hjbqfwup5
parent: pqm at pqm.ubuntu.com-20080430182230-iz5tit0t2ut5clww
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: cleanup-test-suite-loading
timestamp: Wed 2008-04-30 22:09:39 +0200
message:
merge bzr.dev
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:
NEWS NEWS-20050323055033-4e00b5db738777ff
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/fetch.py fetch.py-20050818234941-26fea6105696365d
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/remote.py remote.py-20060720103555-yeeg2x51vn0rbtdp-1
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/revisiontree.py revisiontree.py-20060724012533-bg8xyryhxd0o0i0h-1
bzrlib/smart/server.py server.py-20061110062051-chzu10y32vx8gvur-1
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/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
bzrlib/tests/test_reconcile.py test_reconcile.py-20060225054842-50aa618584a86f26
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
bzrlib/tests/test_smart.py test_smart.py-20061122024551-ol0l0o0oofsu9b3t-2
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
------------------------------------------------------------
revno: 3302.3.92
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: 3302.77.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: 3302.77.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: 3302.77.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: 3302.77.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: 3302.77.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: 3302.77.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: 3302.77.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: 3302.77.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: 3302.3.91
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: 3302.76.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: 3302.3.90
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: 3302.73.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: 3302.75.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: 3302.74.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: 3302.73.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: 3302.75.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: 3302.74.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: 3302.73.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: 3302.75.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: 3302.74.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: 3302.74.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: 3302.73.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: 3302.73.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: 3302.73.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: 3302.75.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: 3302.74.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: 3302.73.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: 3302.73.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: 3302.75.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: 3302.74.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: 3302.73.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: 3302.73.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: 3302.73.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: 3302.73.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: 3302.74.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: 3302.73.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: 3302.73.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: 3302.73.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: 3302.73.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: 3302.3.89
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: 3302.3.88
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: 3302.72.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: 3302.3.87
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: 3302.3.86
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: 3302.71.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: 3302.71.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: 3302.71.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: 3302.3.85
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: 3302.70.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: 3302.71.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: 3302.71.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: 3302.70.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: 3302.70.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: 3302.70.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: 3302.70.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: 3302.70.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: 3302.70.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: 3302.70.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: 3302.70.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: 3302.70.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: 3302.70.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: 3302.3.84
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: 3302.69.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: 3302.69.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: 3302.69.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: 3302.69.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: 3302.69.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: 3302.69.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: 3302.69.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: 3302.69.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: 3302.69.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: 3302.69.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
-------------- next part --------------
Diff too large for email (2060 lines, the limit is 1000).
More information about the bazaar-commits
mailing list