This is a surprisingly frequent need. Fossil is designed around a "get things right the first time" philosophy but real life is often not that crisp and clean. Being able to gracefully recover from mistakes and then get rid of the irrelevant leftover cruft would be a wonderful addition to fossil. I've used a methodology roughly like the following to handle this kind of scenario:
define change-a as your single checkin containing two distinct changes define change-a1 as part one of your two changes in change-a define change-a2 as part two of your two changes in change-a 1. check out the common ancestor node 2. use meld or "fossil cat -r somever somefile > somefile" etc. to pull change-a1 3. commit the change to a new branch change-a1-branch 4. repeat steps 1-3 for change-a2 creating change-a2-branch 5. close the change-a branch leaf, maybe hide it 6. create new branch change-a by merging change-a1 and change-a2 7. merge change-a1 to where they are needed This is harder to describe than to do :) On Wed, Oct 28, 2015 at 11:52 AM, bch <brad.har...@gmail.com> wrote: > 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 >
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
