[MERGE] rip off the trailing whitespace band-aid

[Matt Nordhoff]

Marius Kruger wrote:
> hi,
> as promised, here it is.
> 
> because the bundle and full patch is so big (1.1MB),
> I uploaded a branch
> https://code.launchpad.net/~amanica/bzr/code_style_cleanup
> The merge directive for bundlebuggy is with --no-bundle and --no-patch
> but with the public branch,
> hope that is ok as I've not done that before.
> I attached a compressed version of the full merge directive.

Bundle Buggy didn't track this because the target_branch in your merge
directive isn't <http://bazaar-vcs.org/bzr/bzr.dev/>:

> # Bazaar merge directive format 2 (Bazaar 0.90)
> # revision_id: amanic at gmail.com-20090117122916-s8im1t2jmjzibbb7
> # target_branch: ../bzr.dev
> # testament_sha1: 3cdbec2e34070b87df50ab389ebca39ab01c527a
> # timestamp: 2009-01-17 23:56:12 +0200
> # source_branch: bzr+ssh://bazaar.launchpad.net/%7Eamanica/bzr\
> #   /code_style_cleanup/
> # base_revision_id: pqm at pqm.ubuntu.com-20090115233242-4bxyn4zcj2a0ksfk
> # 

You need to set public_branch on your copy of bzr.dev. I'm not sure the
best way to do that; I would edit .bzr/branch/branch.conf or
~/.bazaar/locations.conf, but there's probably some CLI way to do it.

<snip details>
--