On Wed, May 11, 2016 at 6:24 PM, Marko Käning <[email protected]>
wrote:
> How to achieve a git'ish squash when merging a (private) branch into trunk?
>
> Is this deliberately missing functionality following fossil's mission to
> keep all history?
>
I think you are misunderstanding how a merge works in Fossil. The commands:
fossil update trunk
fossil merge private
fossil commit
will merge the final result of the private branch in to trunk as a single
commit. The same result as your diff/patch commands.
If you really wante each commit of your private branch to appear on trunk,
you have to do multiple merges/commits:
fossil update trunk
fossil merge abcdef
fossil commit
fossil merge bcdefa
fossil commit
fossil merge cdefab
fossil commit
and so on until all of the branch commits are replicated onto the trunk.
_______________________________________________
fossil-users mailing list
[email protected]
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
