Cannot merge bundles created without referencing another branch.
Paul Moore
p.f.moore at gmail.com
Wed Oct 10 08:46:14 BST 2007
On 10/10/2007, Martin Pool <mbp at sourcefrog.net> wrote:
> As I understand it the reason why this is failing is that the recipient of the
> patch must have a copy of your r8 to apply the bundle.
Ah! That's the key piece of information I was missing. Maybe the
following text (or something similar) added to the bzr send help (just
after the initial bullet points) would be useful.
"""
The submit branch is the branch to which the bundle is intended to be
applied. It is needed if an explicit revision range is given, so that
the command can check that it has the base revision for the bundle
already present (otherwise, the bundle will not apply).
"""
It's also interesting in that I would have assumed that bzr send is a
local only command - it didn't occur to me that it might need access
to the target branch (bzr send seems intended for offline development
where mail is the only way to get changes sent back upstream, so in
that context, requiring access to upstream seems contradictory --
presumably, though, bzr send only needs read access, where bzr push
needs update access).
> It might be better if we showed the submit branch, something like
>
> making bundle to merge 23..88 into ../trunk
>
> because as it's automatically set it's possible it can be wrong.
That sounds useful (it also makes it more obvious that the bundle is
only intended for merging into a particular branch).
Paul.
More information about the bazaar
mailing list