On Wed, Aug 15, 2012 at 5:48 AM, Richard Hipp <d...@sqlite.org> wrote: > On Wed, Aug 15, 2012 at 12:03 AM, Nico Williams <n...@cryptonector.com> > wrote: >> There is a cherrypick command? Oh, it's an option to the fossil merge >> command. I had missed that entirely! > > The --cherrypick option has been around for a long time. But formerly, if > you did one or more --cherrypick merges into your checkout, then you would > not be allowed to commit only some of the changes in your checkout using > "fossil commit FILE1 FILE2 ...". When you commit just some of the files, we > call that a "partial commit". The recent change was to drop the restriction > on partial commits following a cherry-pick merge.
Is there any way to request that the changes from a commit be merged into the workspace but not committed? This would be necessary to implement some of the git interactive rebase options. > Note that the "merge" command also includes the --baseline option. The > --baseline option can identify the start of a sequence of checkins that you > want to merge. Suppose there are some sequence of changes in another branch > A->B->C->D. If you do "fossil merge D --baseline A", that would be the > equivalent of doing three separate cherry-pick merges of B, C, and D, in > that order. How would I get the list of commits that "fossil merge D --baseline A" would merge in? Nico -- _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
