DOC: Revsed bundle format 4 & merge directive format 2

Adeodato Simó dato at net.com.org.es
Fri Jun 22 20:30:33 BST 2007


* 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? 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.

Cheers,

-- 
Adeodato Simó                                     dato at net.com.org.es
Debian Developer                                  adeodato at debian.org
 
From the moment I picked your book up until I put it down I was
convulsed with laughter. Some day I intend reading it.
                -- Groucho Marx




More information about the bazaar mailing list