On 2015-03-20 13:04:44, Richard Hipp wrote: > (...) > The way I deal with this in SQLite is: > > (1) Make logically separate changes in separate check-outs so that > they are easy to test and commit separately. (...)
That's the sort of flow-interrupting context switch I was referring to on one hand, for myself; I see the usefulness of this approach, also it's very KISS. I like it. I usually do not treat checkouts as transient as this implies, but there's nothing wrong with doing that, considered it does not interrupt you. Maybe having it in mind won't interrupt me next time I stumble over it, I'll wait and see. > (2) On the occasions when I mess up and accidentally put (...) That's the sort of thing that one can do after the fact, i.e., when the housekeeping portion after the productivity burst is coming to take a breather... see more below. > (3) You might also check-in the whole thing into a side branch, then > do multiple partial merges back into the branch you were (...) I can see one doing this when they approach their checkout with a plan they know will create mess. It's good advice. I think in combination, your three approaches actually cover the use-cases I have, when I'm considering the topic of partial commits. I suppose the process of (2) and a partial commit selection would be actually end up being quite similar (in (2) you have more (visual) context but you make the same choices for the most part, i.e., select this, ignore that, ...) Partial commits would offer a line of "defense", of cleaning up and associating metadata with changes. (2) fulfills this role just as well. (1) is good reminder/advice for when the opening is quick. People should be doing (3) for messy stuff anyways :) > Still, there will always be people who are convinced that there is > nothing that can go wrong and what to do a partial commit against > expert advise. I wanted to showcase the potential usefulness of the feature. You're saying you got me covered already. After some consideration I think I agree. So no need for me to ask for and rely on yet-unwritten code. Thanks, -Martin _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
