suggestions to split changeset

Mads Kiilerich mads at kiilerich.com
Sun Oct 18 16:07:05 UTC 2009


Neal Becker wrote, On 10/18/2009 05:29 PM:
> I have a large repo that was imported from non-hg upstream.  I applied all
> my favorite patches as one initial changeset.  Now I have applied a few more
> changesets.
>
> I want to split that first changeset up into individual functional
> changesets.
>
> Suggestions how to proceed?

First the obligatory disclaimer/warning: Don't ever mess with history - 
especially if it has been shared with others. It is tricky can and will 
go wrong in so many ways.

But if you already have experience working with patches then mq should 
be easy for you to use for what you ask for:

Use qimport -r to change your existing changesets from set-in-stone 
changesets to mq changesets.

Use qpop -a to put them away.

Use qdel to remove the old mq patch containing all your favorite patches.

Use qimport to import your favorite patches one at a time.

Use qpush to apply the rest of your changesets from mq.

Use mq to polish your changes.

Use qfin to make the changes "real" instead of mq changes.

But you _are_ doing brain surgery, so practice on a guinea pig clone 
before doing it for real.

(Alternatively you could use transplant and strip.)

/Mads



More information about the Mercurial mailing list