On Wed, 23 Mar 2011 12:30:17 +0900 "Stephen J. Turnbull" <step...@xemacs.org> wrote: > Antoine Pitrou writes: > > > Now, "hg strip" should definitely be absent of any recommended or even > > suggested workflow. It's a power user tool for the experimented > > developer/admin. Not the average hg command. > > So what you're saying is that Mercurial by itself can't support the > recommended workflow, because any "collapsing" of commits requires > stripping,
Not really. It requires that you either: - work on your long-term features in a separate repo (and produce a diff at the end that you will apply to the main repo) - use mq - use a non-committing equivalent of mq (iterate on a patch which you periodically save with "hg di", for example; that's what I do for most patches) Apparently some of you think "collapsing" should involve some specific hg command. It doesn't. Perhaps the devguide should be rephrased there. Regards Antoine. _______________________________________________ Python-Dev mailing list Python-Dev@python.org http://mail.python.org/mailman/listinfo/python-dev Unsubscribe: http://mail.python.org/mailman/options/python-dev/archive%40mail-archive.com
