merge subdirs

With some help from Robert, I've written a patch to do this. Because merge lines already have an optional revspec field, and it's hard to distinguish subdir names from revspecs, the optional subpath comes after the revspec. i.e. to merge a debian dir of tip, you need a line like:

merge packaging lp:ubuntu/foo/debian -1 debian

It's a bit hackish. Suggestions for improvements are welcome.

Hi,

Could you propose a merge for this?

Even if you don't think it's ready to land yet, it gives us a place to discuss
the code, and critically for me now lets me see the diff.

Thanks,

James

Can't you take advantage of the version identifiers to change how revspecs are presented? E.g. using -r to specify revspecs or something...

On Wed, 2009-11-18 at 03:11 +0000, Michael Hudson wrote:
> Can't you take advantage of the version identifiers to change how
> revspecs are presented? E.g. using -r to specify revspecs or
> something...

I think we should just move revspecs onto the url they are specifying a
rev for.

-Rob

Robert (and others that are interested): James has reviewed the patch so far, and has raised some questions about whether this is actually a useful feature or not. See the review for details (https://code.edge.launchpad.net/~spiv/bzr-builder/merge-subdirs-479705)

This has landed in lp:bzr-builder in r99. It should be in the 0.3 release, I think.

James, I've left this as In Progress as I'm not sure how you'd like to manage your bug statuses. I'm reassigning to you though because I think from this point my part is done, it just needs you to release it :)

Oh, apparently I can't reassign it to ~james-w. Oh well.

Released in 0.4.

Thanks,

James

Is this in Launchpad production now? Does the documentation need to be updated?

I'm talking about
 - https://help.launchpad.net/Packaging/SourceBuilds/GettingStarted and
 - https://help.launchpad.net/Packaging/SourceBuilds/Recipes

On Tue, 17 Aug 2010 09:37:54 -0000, Daniel Holbach <email address hidden> wrote:
> Is this in Launchpad production now?

No, not yet.

I don't know what steps need to be taken aside from updating sourcecode
and the packages that the buildds will use.

Thanks,

James

Is something like http://bazaar.launchpad.net/~launchpad-pqm/launchpad/stable/revision/11271 required?

It'd be nice to have this fix available in Launchpad.

Bug 627119 has been opened about being able to do this on Launchpad.

Thanks, modified https://help.launchpad.net/Packaging/SourceBuilds/KnownLimitations

Fixed in db-stable r10011 <http://bazaar.launchpad.net/~launchpad-pqm/launchpad/db-stable/revision/10011>.

Fixed in db-stable r10012 (http://bazaar.launchpad.net/~launchpad-pqm/launchpad/db-stable/revision/10012) by a commit, but not testable.