On Fri, 24 Feb 2012 08:55:09 -0500 Leo Razoumov <slonik...@gmail.com> wrote:
> In git --rebase it is known as patch squashing. I'm not familiar with git... > 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 I should produce better test case, but it could kind of work...although it's not very pretty. The point is that both hg & git have 'staging area' (fomer in the form of MQ), so when one does with the patches, can cleanly apply them and get rid of the patch queue. Otoh, Fossil is, by design, quite 'unforgiving' when it comes to putting mistakes 'under the rug'. Maybe, for the above example it would be better to toss patches by using stashes, but I've to experiment with it if it could provide better workflow. > 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. Yeah, that's not pretty and I'd like to leave such job to Fossil itself. > 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? New Mercurial has brought interesting concepts of phases...still, I have to experiment a bit more (again) with Fossil before deciding that to use for our upcoming open-source project which we might tackle soon. Iirc, there was statement by Richard that he made 'rename' workable, but too cumbersome, but I see that Fossil now has 'rename' again. What has happened? Sincerely, Gour -- What is night for all beings is the time of awakening for the self-controlled; and the time of awakening for all beings is night for the introspective sage. http://atmarama.net | Hlapicina (Croatia) | GPG: 52B5C810
signature.asc
Description: PGP signature
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
