Collapse extension

[Martin Geisler]

Colin Caughie <c.caughie at indigovision.com> writes:

>> -----Original Message-----
>> From: Dennis Brakhane [mailto:brakhane at googlemail.com]
>> Sent: 05 April 2009 10:15
>> To: Colin Caughie
>> Cc: mercurial at selenic.com
>> Subject: Re: Collapse extension
>>
>> Keep in mind that this will change the revids of all commits made
>> after the commits you want to join, so you better not have pushed
>> already.
>
> Yes indeed, I mentioned this on the wiki page on bitbucket. The idea
> is you don't want the intermediate revisions appearing anywhere
> outside of your local repository, so you collapse before pushing.
>
> I'm not sure what would happen if you did this after you've already
> pushed. Presumably your next push would fail because you'd be creating
> multiple heads, and if you pulled you'd end up with your old,
> uncollapsed versions in a branch alongside your collapsed ones?

Exactly -- Mercurial is very consistent like that: changesets are
identified solely by their revision hash. So Mercurial will treat the
uncollapsed changesets as new and happily pull them in alongside the
modified collapsed ones.

There are some nice pictures here:

  http://www.selenic.com/mercurial/wiki/index.cgi/EditingHistory

-- 
Martin Geisler

VIFF (Virtual Ideal Functionality Framework) brings easy and efficient
SMPC (Secure Multiparty Computation) to Python. See: http://viff.dk/.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 196 bytes
Desc: not available
Url : http://selenic.com/pipermail/mercurial/attachments/20090405/e1b0ff6b/attachment.pgp