[issue3098] Squash merges

[Stefano Tortarolo]

2011/11/10 Arne Babenhauserheide <arne_bab at web.de>

> 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.
>
>
--detach is necessary only if you want to rebase part of a branch.

Stefano
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial-devel/attachments/20111110/c856ea77/attachment-0002.html>