[MERGE] StackableBranch

Colin D Bennett colin at gibibit.com
Wed Jun 11 14:51:09 BST 2008

On Tue, 10 Jun 2008 01:53:00 -0400
Aaron Bentley <aaron at aaronbentley.com> wrote:

> Ian Clatworthy wrote:
> > # Bazaar merge directive format 2 (Bazaar 0.90)
> > # revision_id: ian.clatworthy at canonical.com-20080610045325-\
> > #   hi3yug3nasoe6e1h
> > # target_branch: ../Development1/
> > # testament_sha1: faebafc1e65c0665e9bf55332d74bbfdf373afa0
> > # timestamp: 2008-06-10 15:17:34 +1000
> > # base_revision_id: ian.clatworthy at canonical.com-20080610013832-\
> > #   9dt6c5h67eckiezo
> Please don't submit unmergeable merge directives.
> Bundle Buggy is freaking out because it doesn't have a copy of
> ian.clatworthy at canonical.com-20080610013832-9dt6c5h67eckiezo and it
> can't get one from ../Development1
> Please either use bzr.dev as the submit branch, or supply some other
> valid external URL for the submit branch.
> Aaron

Doesn't the "revision bundle" within the merge directive contain all
the necessary information to merge the merge directive?  I thought that
the revision bundle made the public branch/submit branch unnecessary.

I could imaging BB using the submit branch to determine if this is
something that it should consider for merging to bzr.dev or not, but as
far as actually merging the merge directive into a branch of bzr.dev,
shouldn't it work fine without a submit branch?

I'm just trying to clarify my understanding of how 'bzr send' and merge
directives work.  I really love 'bzr send' now that I've discovered
it and learned how to use it.

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20080611/d5654324/attachment.pgp 

More information about the bazaar mailing list