Merge lp://staging/~jelmer/bzr-builder/merge-unrelated into lp://staging/bzr-builder

It looks ok to me, but I'd like a third opinion from the bzr team.

Thanks,

James

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

On 2/26/2011 8:34 PM, James Westby wrote:
> You have been requested to review the proposed merge of lp:~jelmer/bzr-builder/merge-unrelated into lp:bzr-builder.
>
> For more details, see:
> https://code.launchpad.net/~jelmer/bzr-builder/merge-unrelated/+merge/51425
>
> When merging in a new branch would result in UnrelatedBranches, force the merge with base=NULL_REVISION.
>
> This should fix a common issue where just a single branch with debian/ and
> .bzr-builddeb/ directories is being merged in that has no relation to the
> upstream branch.
>

That is how you would do it manually. (bzr merge -r0..-1 is telling bzr
to use NULL_REVISION as the common ancestor.)

I wonder if it would be better to expose that as a flag on
from_revision_ids indicating that using NULL_REVISION is ok as the
common base ancestor...

Anyway, this is fine with me.

[1] merge: approve

John
=:->

[1] I can't actually vote approve because I'm not allowed to vote on
bzr-builder.

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

iEYEARECAAYFAk1uF9QACgkQJdeBCYSNAAPNegCglM1q3cSm+84ScnVWYoVg5koN
IOcAoMATLEQu5Yv+HqWjC/e7oL9vbunp
=UQwm
-----END PGP SIGNATURE-----