Rev 1669: Merge in push-without-working-tree, knit-sftp-speed,
reconcile-fixes-revision-graph-cache. in
/home/pqm/archives/thelove/bzr/+trunk/
Canonical.com Patch Queue Manager
pqm at pqm.ubuntu.com
Wed May 3 23:01:08 BST 2006
------------------------------------------------------------
revno: 1669
revision-id: pqm at pqm.ubuntu.com-20060503220107-7606072537025d30
parent: pqm at pqm.ubuntu.com-20060503071159-abd0de926d70d64c
parent: robertc at robertcollins.net-20060503100143-94b0e2f638dbbb8d
committer: Canonical.com Patch Queue Manager<pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Wed 2006-05-03 23:01:07 +0100
message:
Merge in push-without-working-tree, knit-sftp-speed, reconcile-fixes-revision-graph-cache.
modified:
NEWS NEWS-20050323055033-4e00b5db738777ff
bzrlib/builtins.py builtins.py-20050830033751-fc01482b9ca23183
bzrlib/knit.py knit.py-20051212171256-f056ac8f0fbe1bd9
bzrlib/reconcile.py reweave_inventory.py-20051108164726-1e5e0934febac06e
bzrlib/repository.py rev_storage.py-20051111201905-119e9401e46257e3
bzrlib/tests/__init__.py selftest.py-20050531073622-8d0e3c8845c97a64
bzrlib/tests/blackbox/test_push.py test_push.py-20060329002750-929af230d5d22663
bzrlib/tests/blackbox/test_reconcile.py test_fix.py-20060223013051-9a188e15a5ee9451
bzrlib/tests/interversionedfile_implementations/test_join.py test_join.py-20060302012326-9b5e9b0f0a03fedc
bzrlib/tests/repository_implementations/test_reconcile.py test_reconcile.py-20060223022332-572ef70a3288e369
bzrlib/tests/test_selftest.py test_selftest.py-20051202044319-c110a115d8c0456a
------------------------------------------------------------
merged: robertc at robertcollins.net-20060503100143-94b0e2f638dbbb8d
parent: pqm at pqm.ubuntu.com-20060429091950-d5ec09cd6e7c591a
parent: robertc at robertcollins.net-20060501232206-38facba683896034
parent: robertc at robertcollins.net-20060502040743-c3eae60f1b9edf1c
parent: robertc at robertcollins.net-20060503092540-9f4487ad389bc285
committer: Robert Collins <robertc at robertcollins.net>
branch nick: integration
timestamp: Wed 2006-05-03 20:01:43 +1000
message:
Multiple merges:
* push should work with branches without a working tree.
* Knit pushes on SFTP are now much faster (removed a bad latency multiplier).
* Reconciles at the end of fetch now skip non-dataloss issues. The command line
reconcile will still check all data.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060502040743-c3eae60f1b9edf1c
parent: pqm at pqm.ubuntu.com-20060429091950-d5ec09cd6e7c591a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: knit-join-batching
timestamp: Tue 2006-05-02 14:07:43 +1000
message:
Fix knit based push to only perform 2 appends to the target, rather that 2*new-versions.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060503092540-9f4487ad389bc285
parent: robertc at robertcollins.net-20060502123240-525d74f55b034ede
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile
timestamp: Wed 2006-05-03 19:25:40 +1000
message:
Finish the reconcile tweak: filled in ghosts are a data loss issue and need to be checked during fast reconciles.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060502123240-525d74f55b034ede
parent: robertc at robertcollins.net-20060502111207-e4ff704e86662870
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile
timestamp: Tue 2006-05-02 22:32:40 +1000
message:
Teach reconcile to check the left-most parent is correct in the revision graph.
------------------------------------------------------------
merged: robertc at robertcollins.net-20060502111207-e4ff704e86662870
parent: pqm at pqm.ubuntu.com-20060429091950-d5ec09cd6e7c591a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: reconcile
timestamp: Tue 2006-05-02 21:12:07 +1000
message:
* Repository.reconcile now takes a thorough keyword parameter to allow
requesting an indepth reconciliation, rather than just a data-loss
check. (Robert Collins)
------------------------------------------------------------
merged: robertc at robertcollins.net-20060501232206-38facba683896034
parent: pqm at pqm.ubuntu.com-20060429091950-d5ec09cd6e7c591a
committer: Robert Collins <robertc at robertcollins.net>
branch nick: push-branch
timestamp: Tue 2006-05-02 09:22:06 +1000
message:
Fix push to work with just a branch, no need for a working tree.
More information about the bazaar-commits
mailing list