0

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.

https://www.mercurial-scm.org/wiki/CollapseExtension

Vadim Kotov
  • 8,084
  • 8
  • 48
  • 62
kalithlev
  • 926
  • 3
  • 12
  • 19
  • 1
    It's not quite an answer so I'll put it up here, but it looks like Mercurial is going this sort of functionality in the future. Changesets will have 'liquid' or 'frozen' states and will be liquid when committed and frozen when pushed. Nothing's finalized yet, but the mercurial-devel mailing list has a lot of possible UIs described. – Ry4an Brase Jan 28 '11 at 15:35

1 Answers1

2

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.

shellholic
  • 5,974
  • 1
  • 20
  • 30