On Wed, May 11, 2016 at 4:24 PM, Marko Käning <sec001+fos...@posteo.net> wrote:
> How to achieve a git'ish squash when merging a (private) branch into trunk? > https://www.fossil-scm.org/xfer/doc/trunk/www/private.wiki seems to document this use case. You merge the private branch into a public branch. The private branch remains private, but all the work from that branch is now in the public branch. How is that different than an explicit squash command? > > Is this deliberately missing functionality following fossil's mission to > keep all history? > > Well, especially in case of a _private_ branch it might make sense to have > such a feature: assume one wants to work locally on something which won’t > be touched by anyone else for the time being. But when the time comes to > make it public one might not always want to push the whole history to the > central repo. > > I figure the only way is to use stg like > > $ fossil diff -v -r 5d7b175ba0 >patch.diff > > followed by > > $ patch <patch.diff > > where needed, right?! > > No other way, as it seems… > > No plans to implement a (perhaps restricted) squash command which would > only > work on private branches? > :-) > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > -- Scott Robison
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
