what do I need to learn to do this task?

Anton Shestakov engored at gmail.com
Tue May 13 05:34:48 UTC 2014


2014-05-13 10:17 GMT+09:00 Michael Mossey <michaelmossey at gmail.com>:
> (6) Continue, creating possibly a dozen small meaningless changesets until
> ready to commit a feature or intermediate feature to main BB repo
> (7) here's the trick I don't understand--somehow push and/or merge my
> changes with the main BB repo, hopefully without pushing a bunch of
> meaningless changesets onto it

I'd like to recommend evolve extension [1]. I'm aware it may not be
the best idea, because the extension is still considered experimental
and for experienced users (or so the page says), but it's a really
elegant solution for squashing multiple "meaningless" changesets into
one "feature-commit":

hg fold -r 10::15

Now you don't see revisions 10 through 15, you only have revision 16
with combined changes (you can also edit 16's commit message in the
process). 10-15 are actually left in your clone, but marked as hidden,
and if you do pull/push they won't get into other clones; only 16, a
single revision.

At least that's what I think, I'm not an expert.

[1]: http://mercurial.selenic.com/wiki/EvolveExtension



More information about the Mercurial mailing list