I've recently discovered the collapse extension and I love it. I can work and commit often, and when I'm done with my work I can collapse revisions into one logical changeset. One big changeset instead of many small ones makes the history a lot cleaner.
Sometimes I lose track of which revisions I can collapse (you should never collapse a revision that isn't local). Are there any tools to help me track which revisions came from a pull or a different repo? This would also help with rebase.
You could make a local tag (
hg tag -l -r tip LASTREMOTE
) every time you pull.But this is a manual process and you can forget to do it. In this case you can use
hg out
.