[MERGE] reconcile - aka fix - with tests

[Robert Collins]

$ diffstat reconcile.patch 
 builtins.py                                        |   26 ++++
 commit.py                                          |   44 ++-----
 reconcile.py                                       |  119
+++++++++++++++++++++
 repository.py                                      |   49 ++++++++
 store/weave.py                                     |    2 
 tests/blackbox/__init__.py                         |   21 +++
 tests/blackbox/test_reconcile.py                   |   51 +++++++++
 tests/blackbox/test_upgrade.py                     |   19 ---
 tests/repository_implementations/__init__.py       |    1 
 tests/repository_implementations/test_reconcile.py |  106
++++++++++++++++++
 10 files changed, 389 insertions(+), 49 deletions(-)
$ wc -l reconcile.patch 
575 reconcile.patch

This patch adds the start of the planned reconcile command. The first
thing it does is a reweave. In the future it will do root id
reconciliation at the same time, and hopefully we can parallise all the
actions.

Rob

-- 
GPG key available at: <http://www.robertcollins.net/keys.txt>.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: reconcile.patch
Type: text/x-patch
Size: 22885 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060223/b2aeaa2c/attachment.bin 
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 191 bytes
Desc: This is a digitally signed message part
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060223/b2aeaa2c/attachment.pgp