Hi Ron,
from what I read about merges in Fossil I had assumed, that they always merge
in all changes
changeset after changeset...
On 12 May 2016, at 03:15 , Ron W <ronw.m...@gmail.com> wrote:
> 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.
But I see now, that I was mistaken in case of a private branch. I think
fossil’s help page for merge
should make that difference clear. Could find that on the wiki’s page for
merging either [1].
Greets,
Marko
[1] http://www.fossil-scm.org/index.html/doc/trunk/www/branching.wiki
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
