[MERGE] StackableBranch

[Ian Clatworthy]

Aaron Bentley 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.

I've set public_branch to bzr.dev in my locations.conf for these
branches now. Does that fix it? I thought I needed to keep the
submit branch as the previous one in the loom (post export) so
that the preview diff came out correctly?

Ian C.