[MERGE] StackableBranch

[Aaron Bentley]

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

Ian Clatworthy wrote:
> Aaron Bentley wrote:
>> 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?

No.  You're now claiming that bzr.dev contains revisions that it doesn't
contain.  If you're going to specify that the target branch is bzr.dev,
you have to use an actual mirror of bzr.dev as the submit branch.

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

The preview diff defaults to using the submit branch, but when you
specify -r, that overrides it.  The main purpose of the submit branch is
to determine which revisions to include in the bundle.

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

iD8DBQFITiHF0F+nu1YWqI0RAv9jAKCCcIch/YkMAzzXf4kK53ItxtSZ9wCdFHg4
70mAFTNgulHtu/BoId9Tqh8=
=twan
-----END PGP SIGNATURE-----