hg equivalent to "bk collapse"?

John Goerzen jgoerzen at complete.org
Wed Mar 14 14:14:10 UTC 2007


On 2007-03-14, Mark Atwood <me at mark.atwood.name> wrote:
> With "bk collapse", you can do a lot of checkins into your local tree,
> which generate a lot of change history.  And then "collapse" them all
> together, for when you checkin to the upstream tree.  Thus everyone
> else doesn't have to see all your "nope, that didnt work either,
> trying something else" changelog entries.

I think that, as others have said, you could achieve this effect with mq
by loading all the patches into mq and then using mq's features to merge
patches.

Alternatively, you can just use 'hg diff -g -r foo -r bar' to export the
changes you want and recommit manually on a different branch.

My own preference is to keep the old branch around and merge the two
together later.  (You'll have conflicts, but they should all
auto-resolve)  That way you still have the original history.

-- John





More information about the Mercurial mailing list