Cannot merge bundles created without referencing another branch.

Aaron Bentley aaron.bentley at utoronto.ca
Mon Oct 8 20:30:53 BST 2007


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

Alexander Belchenko wrote:
> Yes, IIRC I'm also stepped into this behavior when I wrote the patch
> for thunderbird at win32 support. And this behavior ('.' branch already had all
> necesary revisions) breaks the way old bundles working.

There is a very simple solution to this: don't use "." as a submit
branch.  It's totally inappropriate for the purpose.  It is not the
branch you want to submit your changes to.

Merge directives are for contributing to an ongoing project, and the
submit branch should be the branch you want to merge your changes into.
 If there's no such branch, then merge directives aren't appropriate for
your purpose, and you should zip or tar up the branch directory instead.

If you absolutely, positively, *must* use a merge directive, then create
an empty branch and use that as your submit branch.

The old way -r worked was a constant problem, because people who tried
to do cherry-picking were instead making it impossible to merge their
changes.

> Yes, I remember
> your explanation about using this to reduce size of bundle.

I'm not sure what you mean.

> But in my
> opinion if we produce bundle against '.' then it's more understandable
> and straightforward for bzr users if bundle will contain all revisions
> inside.

Producing a bundle against "." is ludicrous, and anyone who does it
deserves what they get.

> Maybe it's more suitable to use bundle command instead of send,
> but bundle in the future will die IIUC, and there is way to nowhere.

The bundle command is essentially the same thing as the send command.

> BTW, I just realized, that new send behavior will breaks my workflow
> to obtain new changes via my bzrdev.bialix.com site.
> I produce bundles from bzr.dev mirror on my site and then download
> bundles to my computer.

Why does this break your workflow?

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

iD8DBQFHCoVt0F+nu1YWqI0RAic5AJ47A1JEPMwANlA1yGz6v4Cgi2+l0gCfSa2e
HSspAF2tRDq8fQ39eqtZxqg=
=4uIb
-----END PGP SIGNATURE-----



More information about the bazaar mailing list