On 10/28/15, Richard Hipp <d...@sqlite.org> wrote: > On 10/28/15, to...@acm.org <to...@acm.org> wrote: >> OK, but doesn't cherry-pick work the same as a MERGE but only for single >> version of the timeline? >> >> My intent was to get all changes from the branch (the whole history) but >> for >> > > Fossil does not currently support the ability to merge some files but > not others. That has never come up before.
I've certainly wished for the NOP operation that looks to be a side effect of the [merge]/[revert] (and a cause of concern/confusion for Tony). I tried to describe this to you years (6?) ago (without success), but now I see I can get an effect of my original wish this way... I'll see if I can dig out my original problem/paradigm, in case it's enlightening. -bch > > -- > D. Richard Hipp > d...@sqlite.org > _______________________________________________ > fossil-users mailing list > fossil-users@lists.fossil-scm.org > http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users > _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users