[MERGE] Initial support for marking bugs as fixed using bzr

[Aaron Bentley]

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

James Westby wrote:
> On (12/04/07 18:07), Aaron Bentley wrote:
>> James, please don't force 'bundle' to omit revisions.  Just use bzr.dev
>> (or a mirror) as your submit location.
>>
>> Omitting revisions breaks bundle's usefulness as a means of shipping
>> revisions, because I can't use your bundle to apply your changes.  It
>> also obscures the full effect of your bundle, since merging your bundle
>> introduces ListOption.
> 
> You can use my bundle to apply my changes. It just requires you to have
> a branch that has Jonathan's bundle already applied.

The fact that it requires another bundle is brokenness.  I should not
need anything other than your bundle to merge your changes.  That is the
whole point of bundles.  If you don't want to do that, use a patch.

> Also it doesn't obscure the effect of my bundle. My bundle has nothing
> to do with ListOption. You can see what changes I want to make from the
> diff in mine.

Your bundle requires jml's and jml's is not yet merged.  It is derived
from jml's bundle, so it supersedes it.  Merging your bundle will apply
James' changes, so deciding whether to apply your bundle must include
deciding whether to apply jml's changes.

Therefore it's misleading not to include jml's changes in your diff.

> However I accept that this may not be the preferred way of working, but
> I don't believe there is a policy on that yet. If we want to have one
> then please say so and I will not do it again. Allow me to explain the
> reasons why I chose to do it this way.

I hereby propose a policy that all merge requests include a patch that
shows all the changes that would be made if the merge were performed.

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

iD8DBQFGH3710F+nu1YWqI0RAtuWAJ4qUiTwsOiIpPPLdjJtpOT0UFYLUwCfSQ6d
q9wVvVFdQQPzXQssZH1/NWM=
=kutE
-----END PGP SIGNATURE-----