[MERGE REVIEW] Conflicts serialized

[Aaron Bentley]

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

Hi all,
I've got conflict serialization working, which means that when merge
conflicts occur, they're stored in a rio file.

The 'conflicts', 'status' and 'resolve' commands will all use the new
conflicts list in WorkingTree3.  Older trees will continue to detect
text/content conflicts using '.BASE', '.THIS', '.OTHER' files.

The display of 'conflicts' and 'status' now shows the full text of the
conflict, as emitted by 'merge'.

Revert will resolve conflicts in the files it reverts.

I've also tweaked the rio functionality slightly, allowing rio to
produce a file object directly.  This fits the Transport and
LockableFiles interfaces better.

And there was a tiny bug in the RioReader; the stanzas it produced had
unicode tags.

Patch attached, or see http://code.aaronbentley.com/bzr/bzr.ttransform/

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

iD8DBQFEEc2W0F+nu1YWqI0RAokIAJ9W/zsON4qUdy/DGw4TK0MVuDjM6gCfdvLQ
3Z0FwkZfxNB75SUGirBSEvA=
=npfM
-----END PGP SIGNATURE-----
-------------- next part --------------
A non-text attachment was scrubbed...
Name: conflict-lines.patch
Type: text/x-patch
Size: 29898 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20060310/408c8dbc/attachment.bin