[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 Jelmer Vernooij <jelmer at vernstok.nl <mailto:jelmer at vernstok.nl>>
> ...
> 
>     Likewise, could the fix for
>     https://bugs.edge.launchpad.net/bzr/+bug/293440 make it into a 1.9.1 ?
> 
> 
> It doesn't look like Martin wants to give it to us:)
> 
> The original 'merged' fix only changed the news:
> 
> $ bzr log -v -r revid:mbp at sourcefrog.net-20081107055916-ky49y104205bnpwp
> ------------------------------------------------------------
> revno: 3815.1.6
> revision-id: mbp at sourcefrog.net-20081107055916-ky49y104205bnpwp
> parent: mbp at sourcefrog.net-20081107054139-zw6p9ng94dhgk2sz
> parent: pqm at pqm.ubuntu.com-20081031091201-8b83yv5co6o2uuzc
> committer: Martin Pool <mbp at sourcefrog.net <mailto:mbp at sourcefrog.net>>
> branch nick: prepare-1.9
> timestamp: Fri 2008-11-07 16:59:16 +1100
> message:
>   Merge fix for #293440
> modified:
>   NEWS                           NEWS-20050323055033-4e00b5db738777ff
> (END)
> 
> any ways, this patch should be suitable for bzr.dev and 1.9.1
>  
> 
> regards
> marius
> 
> 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.

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.

Aaron