[MERGE] bzr status --versioned NEWS

[Kent Gibson]

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



Aaron Bentley wrote:
> Kent Gibson wrote:
>
>> Aaron Bentley wrote:
>>>> Thanks for the patch.  Next time, can I suggest attaching a
>>>> merge directive instead?
>
>> Sure thing.  I would've for this one, but at the moment I haven't
>>  RTFM on merge directives.
>
> For this case, it would be bzr merge-directive --diff
> http://bazaar-vcs.org
> http://bazaar.launchpad.net/~warthog618/bzr/bzr.kg
>
> Which produces the attached patch.  Anyhow, I've submitted it.

I just noticed that, while resolving conflicts after merging bzr.dev,
I managed to remove the NEWS entry.  So here it is, restored in all
it's glory.

One question on the merge-directive.  Quick it isn't - I assume
because it is comparing against bzr.dev.
I have a local bzr.dev available.  I see a performance benefit in
using that as the SUBMIT_BRANCH.
Any problem with that - so long as I hack the resulting target_branch
to point to the real bzr?  And any way to formalise the hack?

Cheers,
Kent.


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

iD8DBQFF9ruvgoxTFTi1P8QRAl6CAKDnHdbwIlfwxeE/acFKAShBm6lBagCfYqnf
r3cQ+0f8P0i0tO1ir9uYAZc=
=ZD5G
-----END PGP SIGNATURE-----

-------------- next part --------------
A non-text attachment was scrubbed...
Name: status_versioned_NEWS.diff
Type: text/x-patch
Size: 708 bytes
Desc: not available
Url : https://lists.ubuntu.com/archives/bazaar/attachments/20070313/0e5b022f/attachment.bin