merge subdirs

Bug #479705 reported by Robert Collins on 2009-11-10
46
This bug affects 6 people
Affects Status Importance Assigned to Milestone
Launchpad itself
High
Aaron Bentley
bzr-builder
High
Andrew Bennetts

Bug Description

We need to be able to merge subdirs.

e.g. given trunk in bzr-git, packaging in lp:ubuntu/foo, we want;
merge packaging lp:ubuntu/foo/debian debian
to merge only the debian directory

Related branches

Andrew Bennetts (spiv) wrote :

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.

Changed in bzr-builder:
status: New → In Progress
James Westby (james-w) wrote :

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

Michael Hudson-Doyle (mwhudson) 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...

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

Andrew Bennetts (spiv) wrote :

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)

James Westby (james-w) on 2010-01-27
Changed in bzr-builder:
importance: Undecided → High
Martin Pool (mbp) on 2010-05-28
Changed in bzr-builder:
assignee: nobody → Andrew Bennetts (spiv)
Andrew Bennetts (spiv) wrote :

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 :)

Andrew Bennetts (spiv) wrote :

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

James Westby (james-w) wrote :

Released in 0.4.

Thanks,

James

Changed in bzr-builder:
status: In Progress → Fix Released
Daniel Holbach (dholbach) wrote :

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

James Westby (james-w) wrote :

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

Daniel Holbach (dholbach) wrote :

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.

Andrew Bennetts (spiv) wrote :

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

Aaron Bentley (abentley) on 2010-08-31
Changed in launchpad-code:
importance: Undecided → High
status: New → Triaged
Tim Penhey (thumper) on 2010-10-12
Changed in launchpad-code:
status: Triaged → In Progress
Tim Penhey (thumper) on 2010-10-12
Changed in launchpad-code:
assignee: nobody → Aaron Bentley (abentley)
Changed in launchpad-code:
milestone: none → 10.12
tags: added: qa-needstesting
Changed in launchpad-code:
status: In Progress → Fix Committed
tags: added: qa-untestable
removed: qa-needstesting
Launchpad QA Bot (lpqabot) wrote :

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

Curtis Hovey (sinzui) on 2010-12-08
Changed in launchpad-code:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Duplicates of this bug

Other bug subscribers

Related blueprints