On Fri, Feb 24, 2012 at 15:12, Gour <g...@atmarama.net> wrote: > On Fri, 24 Feb 2012 08:55:09 -0500 Leo Razoumov <slonik...@gmail.com> wrote: >> 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.
Actually I stand corrected. $ fossil diff --new-file --from P1-parent --to P3 | patch -E should add/remove text files automatically. Binary files, on the other hand still pose a problem. > >> 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. > > I fully agree with it. ;) > > Btw, may I ask you do you miss something else in Fossil as (possibly) > ex-hg user? > I used Hg briefly few years ago. Now I abandoned Hg completely and am an active GIT user for my heavy lifting projects. I recently discovered fossil and find it very refreshing and intriguing. One thing that I miss in fossil above everything else is inability to push/pull individual branches or/and individual artifacts. This is really big item on my wish list. Current fossil model has only two choices: public branches that are accessible to all, and private branches that are for-your-eyes-only. But I need few branches that I share with my team members but do not leak outside of the company. Fossil provides no mechanism to support such a work-flow. --Leo-- _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users