collapse development branches into single commit message

[Abderrahim Kitouni]

Hello,

2011/10/27 Bernd Schubert <bernd.schubert at itwm.fraunhofer.de>
>
> Hello,
>
> we are presently considering to switch our project from svn to mercurial, but the way
> mercurial seems to handle branches is holding us back and to make us re-consider git.
> Here is an example from my current work (with pbranch):
>
> schubert at fsdevel3 fsdevel.test>hg pgraph
> [...]
>
> In the past I have used mq, but as mq is patch based I always have issues with fixes in a
>
> parent patch, as those fixes often make children patches not to apply any more. The way
>
> out of that are 3-way branch merge, which works rather well. We also want to 3-way
> merge bugfixes and features into various stable release and mq has proven to fail for that.
> The issue is now that we want to commit development branches to the default branch,
> but we are not at all interested in the branch local history, but we want to have a _single_
> patch-like commit message. Unfortunately, my attempts to achieve that fail so far:

Since you seem to be using pbranch, you're probably looking for 'hg pexport'

http://arrenbrecht.ch/mercurial/pbranch/export.htm

HTH,
Abderrahim