[issue3098] Squash merges

[Arne Babenhauserheide]

Am Donnerstag, 10. November 2011, 13:07:31 schrieb Ruslan Yushchenko:
> The use of the rebase extension here have a disadvantage. You'll need to
> merge with every changeset of source (other) branch and if it contains many
> changesets it can be annoying.

That would be true the other way round, too. Or do you have different 
experiences? 

The disadvantage of merge --squash is that it does not result in correct 
history: A second merge would not know that there was a first merge. 

So AFAIK a rebase is the correct way to handle this: 

$ hg rebase --detach --collapse -b <base revision> [-d <dest>]

I’m not sure if --detach is necessary. 

Best wishes, 
Arne
--
Konstruktive Kritik: 

- http://draketo.de/licht/krude-ideen/konstruktive-kritik

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 316 bytes
Desc: This is a digitally signed message part.
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-devel/attachments/20111110/01c18045/attachment.asc>