Merge lp://staging/~spiv/bzr-builder/merge-subdirs-479705 into lp://staging/bzr-builder

Hi,

The launchpad team have no plans to provide a newer bzr in older
releases, so I would like to proceed by copying the code in to bzr-builder
where needed.

As for the changes proposed here, they are largely fine.

nest-part packaging lp:~foo-dev/foo/packaging -1 debian

I would like to move the revision spec to the end of the line and make it optional.

I don't mind too much whether it or the target subdir comes first.

134 + op = OperationWithCleanups(nest_part_branch)

I don't think we can rely on OperationWithCleanups as it is fairly new,
so either we copy that too, or we do it the old fashioned way.

Thanks for your work on this. Let me know if you would like me to
make these changes.

Thanks,

James

What do you mean by "no plans to provide a new bzr in old releases"? Is the
ppa not enough? Should we push to get it into backports or something?

- Martin

On 30/07/2010 7:56 AM, "James Westby"
<<email address hidden><jw%<email address hidden>>>
wrote:

Review: Needs Fixing
Hi,

The launchpad team have no plans to provide a newer bzr in older
releases, so I would like to proceed by copying the code in to bzr-builder
where needed.

As for the changes proposed here, they are largely fine.

nest-part packaging lp:~foo-dev/foo/packaging -1 debian

I would like to move the revision spec to the end of the line and make it
optional.

I don't mind too much whether it or the target subdir comes first.

134 + op = OperationWithCleanups(nest_part_branch)

I don't think we can rely on OperationWithCleanups as it is fairly new,
so either we copy that too, or we do it the old fashioned way.

Thanks for your work on this. Let me know if you would like me to
make these changes.

Thanks,

James

--
https://code.launchpad.net/~spiv/bzr-builder/merge-subdirs-479705/+merge/31251
Your team canoni...

On Thu, 29 Jul 2010 22:16:41 -0000, Martin Pool <email address hidden> wrote:
> What do you mean by "no plans to provide a new bzr in old releases"? Is the
> ppa not enough? Should we push to get it into backports or something?

https://bugs.edge.launchpad.net/launchpad-code/+bug/603615

They don't plan to put the work in to providing an older bzr to the
builders when doing recipe builds.

Thanks,

James

But they are going to provide a backported bzr-builder (or to run it from a checkout?) That seems a bit strange, but perhaps it's most pragmatic approach.

On Thu, 05 Aug 2010 01:28:43 -0000, Martin Pool <email address hidden> wrote:
> But they are going to provide a backported bzr-builder (or to run it
> from a checkout?) That seems a bit strange, but perhaps it's most
> pragmatic approach.

They are. However, the other day Aaron was asking about running
bzr-builder outside the chroot so that only one version was used. That
would also enable us to use a newer bzr without backporting. I don't
know if he decided to do this or not.

Thanks,

James

We are planning to run bzr-builder outside the chroot. That should reduce the risk of new bzr's contaminating daily builds for old releases, reduce the amount of maintenance required when new releases of bzr-builder become available, and allow us to build from 2a branches into ancient, but still supported, distros like Dapper.

> Thanks for your work on this. Let me know if you would like me to
> make these changes.

The backport of 2.2's MergeIntoMerger and removal of OperationWithCleanups can be found in <https://code.edge.launchpad.net/~spiv/bzr-builder/backport-merge-into/+merge/32428>.

I'm working on the requested syntax change now.

The syntax change is now done. Please review.