On Fri, Feb 24, 2012 at 02:53, Gour <g...@atmarama.net> wrote: > On Fri, 10 Feb 2012 15:46:15 -0500 > Leo Razoumov <slonik...@gmail.com> wrote: > >> I am sorry if my language was not clear. Here are the diagrams: > > I am sorry to jump in this thread...we might soon start working on our > application which is meant for niche market and therefore potential > contributors although experts in the field are probably not savvy with > DVCS tools, so Fossil is definitely unprecedented wiht its features and > simplicity to setup & use. > > Otoh, we're familiar with DVCS tools (starting from darcs, bzr, mtn) and > now being hg user would like to not to lose any functionality from e.g. > hg. My question is connected with Mercurial's MQ feature... > >> Then after some time trunk moves forward >> >> A----B----C----D----E-- <= trunk >> \-P1--P2--P3 <= my-patches > > Let's assume I've the same situation like above, but consider that my > patches are too granular to commit each one to the trunk and would like > to eg. combine P1 & P3 together and then apply them as: > > P2' --> P1_P3' to my trunk. > > Is it possible to do it in Fossil? >
In git --rebase it is known as patch squashing. Could you, try the following (untested) fossil update E fossil merge --cherrypick P1 fossil merge --cherrypick P2 fossil merge --cherrypick P3 fossil commit --tag P1-P3.squashed If the code above does not work you can try poor-man's approach with the patch (untested) fossil co E fossil diff --from P1-parent --to P3 | patch Please, be aware that "patch" method does not handle addition/removal of the files. --Leo-- P.S. Maintaining patch sets, squashing/folding are everyday tasks in many popular work-flows. It would be great if fossil supports them natively rather that via ugly hacks. _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
