Thus said Natacha Port? on Thu, 06 Jul 2017 19:30:29 -0000: > Now imagine you leave things as they are after (3) to do some non-dev > stuff (or some dev on other repositories), and you receive a serious > windows-specific bug report. You drop everything to work on it, > forgetting the "fossil up". You eventually make a fix in some code path > that is never reached on Linux, or for another reason you decide to > commit straight away.
First, will you provide a minimal working transcript of the problem you're encountering? Did you first create a new clean working checkout for your serious windows-specific bug? Something like: mkdir /path/to/newbugcheckout cd /path/to/newbugcheckout fossil open /path/to/repository.fossil Make all your changes there so you don't taint your current working checkout. If you didn't do this, I highly recommend this practice. > So I really missed a way of asking fossil to just commit the files as > they were but with another parent than what was currently recorded as > the current commit. How? Is it not possible to just commit them against the checkout against which such precious data was generated; that presumably was good before you started generating new and uncommitted precious data, no? Or did you start on a given commit (say 1), generate some new and precious data without committing, and then decide to jump into other work, perhaps less precious, commit just those things (perhaps repeatedly), and then now you're at commit 10 and you decide you want to commit your precious data? In that case, cannot you just do ``fossil update 1'' and then commit the precious data? You'll have a fork, but you can work out the details later if the goal is to get the precious data committed. I'm not sure why this would ever result in conflicts, or the inability to merge and commit the data. Thanks, Andy -- TAI64 timestamp: 40000000595ea731 _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
