[MERGE] Shelf 3 / 5: Unshelver and metadata

[Aaron Bentley]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

Hi all,

This patch implements the Unshelver class, which can make a Merger that
will unshelve the changes.  It also adds some additional metadata to
shelf files: a revision-id record to indicate which tree the Transform
should be applied to, and an optional user-specified message.

The shelved TreeTransform cannot be applied directly to the WorkingTree,
because its contents may have changed.  Instead, 3-way merge is
performed with:
THIS: The working tree
BASE: The TreeTransform basis revision
OTHER: The TreeTransform's PreviewTree.

(Actually, some invocations of "unshelve2" will not apply the changes to
the tree.  They will use a PreviewTree generated from the merge.  This
is why Unshelver doesn't do the unshelving directly.)

Aaron
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.9 (GNU/Linux)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iEYEARECAAYFAkj3+4MACgkQ0F+nu1YWqI102QCfUzTA7aRe88d5ZrlY2cMKrnA7
dMcAn0mIZuo6CSLpMg2lM3NMS0XNw56P
=kPe9
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: unshelve-57.patch
Type: text/x-diff
Size: 46313 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20081016/4da84661/attachment-0001.bin