On Wed, Aug 15, 2012 at 11:26 AM, Richard Hipp <d...@sqlite.org> wrote: > On Wed, Aug 15, 2012 at 12:22 PM, Nico Williams <n...@cryptonector.com> > wrote: >> Is there any way to request that the changes from a commit be merged >> into the workspace but not committed? > > "fossil merge" will only merge changes into the local checkout. You always > have to do a separate "fossil commit" to add the merge results back into the > repository. --cherrypick does not change this in any way.
Ah, so, then the sequence to do a git-like rebase would be to make a list of commits, create a new branch, then for each commit run fossil merge --cherrypick each commit, review changes, fossil commit if desired (or not, if one wants to squash the next commit). Good! >> How would I get the list of commits that "fossil merge D --baseline A" >> would merge in? > > Point your webbrowser to http://project-domain/project/timeline?from=A&to=D. > For example: > > http://www.sqlite.org/src/timeline?from=1e6f5ea&to=6954fe Is there any way to do this on the command-line? Nico -- _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
