How to place local commits on top of stretched heads

Question

How do I make my local commits appear on top of recently typed heads?

Here's what happened:

1) I made some changes

2) Redid them in my local repository

3) Popped from the remote repository (now I have 2 eads, one of which is my local changes)

4) How to place local changes on top of another head? I also want to accept all the changes from a recently typed head so that he does not ask me to merge files that were not part of the local change sets that I made.

Answer 1

You can use RebaseExtension .

Example:

hg rebase -b <your head revision> -d <latest pulled commit>

Puts the set of all your changes from the specified revision (specified with -b) and its ancestors before, but not including the common ancestor of the target version, on top of the target version.