fixing an old patch

[Martin Geisler]

Sam Steingold <sds at gnu.org> writes:

> Suppose I have a repo with, say, 10 revisions: 0..9.
> One of them (say, rev6) is horribly broken, I want to fix it.
> If this were CVS, I would have just committed a fix (rev10) and lived
> with broken revisions 6,7,8,9 - horribly breaking bisect.
> However, this is mercurial, so I can do better.
> I can
> - export and strip rev9,8,7,6;
> - apply rev6, fix it, commit;
> - import rev7,8,9.
> Can I do better?
> E.g., can I somehow modify rev6 in place?
> (one improvement seems to be that I can use strip+unbundle instead of
> export+strip+import, right?)
> I don't mind if rev6 becomes rev9 and revs7,8,9 become 6,7,8 respectively.
> (Let us assume that the patches 6,7,8,9 commute in the sense that they
> can be applied without conflicts in any order and that no clones are involved).

Search for "editing history" in the Mercurial wiki and see this
extension:

  http://mercurial.selenic.com/wiki/HisteditExtension

The MQ extension is another popular way to manipulate history.

-- 
Martin Geisler

Mercurial links: http://mercurial.ch/
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 197 bytes
Desc: not available
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20110517/adf4da0c/attachment.asc>