Mercurial - Merge parent changes into child fork as individual commits?

My desire is to keep my fork up to date with the parent, and ideally record the parent's individual commits + messages, so that I have a full history in the fork, of what changed in the parent.

So essentially, when you start a fork and you see the parent's entire commit history as the "starting point" for your fork, I would like to keep the parent's commit history ongoing in the fork, with my fork-specific commits interspersed (with c开发者_运维技巧onflict resolution as needed).

Is this possible?

Or if that's not possible, is there a way to script an automatic pull & merge of parent changes into the child fork, while coalescing the parent's commit messages into the new merge's commit message? (so all individual messages from imported commits, would be combined into one massive merge message)

If I am not mistaken, mercurial and git share a lot in terms of data structures used for history and, in git at least, merging does just what you ask for. Just make sure that your merge commit (or changeset, as hg calls it) actually links to both parent commit (the mostrecent parent project commit and your fork's most recent commit), and that's it.

After merging, check upon the tree with, for example, hgk. It should look like: http://wiki.genunix.org/wiki/images/3/3f/Screenshot-hgk.png