fixing an old patch

[Mark Edwards]

[disclaimer: I'm just starting to understand Hg myself.  This is as much a question as it is a comment.]

Why wouldn't you just update to rev 6, make your changes, and commit?  
This will create a new head (branching at rev 6) and you can choose to merge that change forward into any (or all) other revs. 

Wouldn't bisect still work? (perhaps after merging the fix)



  

-----Original Message-----
From: mercurial-bounces at selenic.com [mailto:mercurial-bounces at selenic.com] On Behalf Of Sam Steingold
Sent: Tuesday, May 17, 2011 1:13 PM
To: mercurial at selenic.com
Subject: fixing an old patch

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

Thanks!

-- 
Sam Steingold (http://sds.podval.org/) on CentOS release 5.6 (Final) X 11.0.60900031
http://ffii.org http://honestreporting.com http://mideasttruth.com
http://jihadwatch.org http://palestinefacts.org http://openvotingconsortium.org
.sigs are like your face - rarely seen by you and uglier than you think
_______________________________________________
Mercurial mailing list
Mercurial at selenic.com
http://selenic.com/mailman/listinfo/mercurial