ansaurus

Question

Getting rid of a dangling changeset after rebase in mercurial

Answer 1

+1 A:

By doing hg strip 5431, strip is in the mq extension.

Note that strip is a destructive operation, use with care!

mizipzor 2010-05-24 12:34:31

It's irresponsible to recommend 'strip' without providing the basic warnings. Strip and other history-editing commands aren't part of the default mercurial feature set for a reason -- mercurial is about an immutable sequence of changesets, and extensions that rewrite history have inherent risks and range from useless to dangerous if folks have already pulled the changesets.

Ry4an 2010-05-24 13:47:24

Since strip is a command you have to explicitly enable I just linked to the wiki pages that have the instructions for doing so. Those pages also gives all the necessary warnings. I thought that was enough (would have been a different thing if I included the instructions for enabling it here), but sure I put in a small warning here as well.

mizipzor 2010-05-25 11:54:32

Thanks for your answer and the warnings - I've used ´strip´ in some places but have been boggled by the first paragraph of its help: ´strip a changeset and all its descendants from the repository´.Well - it did just that, i.e. not only changeset 5431 was stripped, but also all descendants - lucky me there is ´hg unbundle´ :-)I want to get rid of changeset 5431 and *only* that changeset.

steglig 2010-05-25 18:55:20

I thought 5431 had no descendants. Would that mean that 5433 is the tip and 5431 and 5430 has no common ancestor? What do you mean with "rebase", by the way? Are you referring to the mercurial extension?

mizipzor 2010-05-26 07:05:39

He has two roots (5430 and 5431) and stripping away 5431 will also remove 5432 and 5433 since they are children of 5431. There is basically no way to remove an ancestor without removing the children as well.

Martin Geisler 2010-05-28 18:08:57

@mizipzor: I did a ´hg pull --update --force <other repo>´ (corrected that in my question) and then rebased the second commit of the pulled repo on top of the current repo.

steglig 2010-05-29 11:24:58

@Martin: Thanks - then I'll have to live with that unsightliness.

steglig 2010-05-29 11:25:32

ansaurus

tags:

views:

answers:

Getting rid of a dangling changeset after rebase in mercurial

related questions