merge hook that allows tree overlays

Bug #906877 reported by Jelmer Vernooij on 2011-12-20
6
This bug affects 1 person
Affects Status Importance Assigned to Milestone
Bazaar
Medium
Jelmer Vernooij

Bug Description

It would be nice if there was a hook in merge which was called right before the full merge, and could be used to e.g. unapply all patches in the tree.

Related branches

Jelmer Vernooij (jelmer) on 2011-12-20
Changed in bzr:
status: New → In Progress
importance: Undecided → Medium
assignee: nobody → Jelmer Vernooij (jelmer)
tags: added: hooks merge udd

> It would be nice if there was a hook in merge which was called right
> before the full merge, and could be used to e.g. unapply all patches in
> the tree.

This could be a filtered view, perhaps?

(Currently they are only per-file rather than able to change the
tree-shape, but that's also true of current merge hooks.)

Jelmer Vernooij (jelmer) wrote :

Am 21/12/11 01:54, schrieb Andrew Bennetts:
>> It would be nice if there was a hook in merge which was called right
>> before the full merge, and could be used to e.g. unapply all patches in
>> the tree.
> This could be a filtered view, perhaps?
>
> (Currently they are only per-file rather than able to change the
> tree-shape, but that's also true of current merge hooks.)
Yeah, a filtered view would eventually be the nicest solution for this
kind of thing.

At the moment I'm simply creating lightweight checkouts, unapplying the
patches there, and then overriding the trees in the merger with those
lightweight checkouts. A tree merge hook is simplest for that (I've
already put up an MP for a pre_merge and post_merge hook). It's far from
ideal because of the overhead in creating new trees, but it's a start.

It would be really nice if we could get to the point where we can
actually apply the quilt patches on top of the existing trees, in memory.

Cheers,

Jelmer

Vincent Ladeuil (vila) on 2012-01-16
Changed in bzr:
milestone: none → 2.3.5
milestone: 2.3.5 → 2.5b5
status: In Progress → Fix Released
To post a comment you must log in.
This report contains Public information  Edit
Everyone can see this information.

Other bug subscribers