[merge][#293440] apply Martin's fix for `Cannot commit to bound svn branch: "invalid property value 'branch-nick' for None"`

[Aaron Bentley]

Marius Kruger wrote:
> 2008/11/18 Aaron Bentley <aaron at aaronbentley.com
> <mailto:aaron at aaronbentley.com>>
> 
>     Marius Kruger wrote:
>     ...
>     > BTW. while bundling this patch `send` didn't seem to give the
>     correct output
>     > $ bzr send -o ../plugins/svn-nick-problem.patch -r -2.. .
>     > Bundling 0 revision(s).
> 
>     You didn't tell it what you wanted properly.  Please don't send bundles
>     that you know are broken.  When you do that, you break Bundle Buggy, and
>     I have to manually intervene.
> 
>  
> I'm sorry, I didn't realise it is broken, since the diff looked fine.

A merge directive is meant to send all the revisions needed to apply the
change.  It is unusual, but not impossible, for 0 revisions to be adequate.

> I attached a proper bundle now.
>  
> 
>     The current branch is NEVER an adequate submit branch.  You should
>     ALWAYS have to specify the branch you are sumitting to, or a mirror
>     of it.
> 
> 
> I've always assumed it would work.

It cannot work if it doesn't know what revisions are already present in
the branch you are sending to.

> I first tried it without specifying a submit branch,
> 
>     $ bzr send -o ../plugins/svn-nick-problem.patch -r -1
>     Using saved parent location
>     "http://bazaar.launchpad.net/%7Ebzr/bzr/bzr.1.9/" to determine what
>     changes to submit.
>     ^Cbzr: interrupted       
> 
> but didn't want to wait for it when I realised it is going over the wire.

That default behaviour would have generated a correct bundle.

> So are you saying if I want to bundl e just the last commit of a branch,
> that I have to branch it, and uncommit it first ?

No, I'm saying if you specify a branch, it should ALWAYS be the branch
you are submitting to, or a mirror of it.  If you want to avoid the
trivial amount of net traffic required to generate a bundle, I suggest
keeping a local mirror of bzr trunk, and setting its public_branch to
http://bazaar-vcs.org/bzr/bzr.dev.

I'm not addressing the case where you want to bundle just the last
commit of a branch.  I don't think you should care about that kind of
bookkeeping.  You should only care about bundling all the revisions that
aren't already present.

Aaron