DOC: Revsed bundle format 4 & merge directive format 2

[Aaron Bentley]

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

Adeodato Simó wrote:
> * Aaron Bentley [Fri, 22 Jun 2007 14:53:48 -0400]:
> 
>> Merge Directive format 2 may provide a patch preview of the change being
>> requested.  If a preview is supplied, the receiving client will verify that
>> the actual change matches the preview.
> 
> What does "the receiving client" mean here?

I meant the bzr client that tries to install and merge the bundle.

> In particular, I'm
> interested in knowing if `bzr merge /path/to/merge-directive` will
> complain and refuse to merge if the contents of the bundle (or remote
> branch) and the provided preview differ.

That's exactly what I mean.

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

iD8DBQFGfCzP0F+nu1YWqI0RArD0AJ9VrNU0ug23/wpASEtbKK9IRq/FZgCghXAx
hHG2bDWBWO5un+FWMPYmBsY=
=c1OV
-----END PGP SIGNATURE-----