[MERGE] Shelf 2/5: ShelfCreator

[Aaron Bentley]

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

Hi all,

This is the object that is used to select changes to sheve.  It builds
up two transforms: the work_transform, which is applied to the working
tree, and the shelf_transform, which is ultimately serialized.

The target_tree is typically the basis revision, but may be any other
revision.  As work_tree and target_tree are compared, the opportunity to
 shelve differences between the two is provided.  The two transforms are
updated as opposites, so shelving a deletion in the work_transform
applies a deletion to the shelf_tranform.

I'm quite proud of shelve_lines, which, given a new version of the file,
will figure out what lines you have removed, and add them to the
shelf_transform.  This means that virtually any tool can be used to
create the new version of the file.

Aaron

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

iEYEARECAAYFAkj33AwACgkQ0F+nu1YWqI1FkQCdGHLPzpgwMuCKa0UR/VmwDepz
wG0An1Zq50zUqiCc4Dm6sBL4Hna1702/
=I/9b
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: prepare-shelf-46.patch
Type: text/x-diff
Size: 49855 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20081016/77621606/attachment-0001.bin