Finished the basic test.
diff --git a/Readme.org b/Readme.org --- a/Readme.org +++ b/Readme.org @@ -313,4 +313,12 @@ hg log -G cd .. #+END_SRC -That’s it. All that’s left is fixing the plan, but that’s left for the reader :) +/note: We use graft here, because using a second amend would just change the changeset in between but not add another change. If there had been more changes after the single followup commit, we would simply have called evolve to fix them. Which would have just worked, because graft -O left an obsolete marker on the grafted changeset, so evolve would have seen how to change all its children./ + +That’s it. All that’s left is fixing the plan, but I’ll rather do that outside this guide :) + +* Conclusion + +Evolve does a pretty good job at making it convenient and safe to rework history. If you’re an early adopter, I can advise testing it yourself. Otherwise, it might be better to wait until more early adopters tested it and polished its rough edges. + +/note: hg amend was subsumed into hg commit --amend, so the dedicated command will likely disappear./