The thing is I have to have both changes locally in order to fix the problem, but I do not want to commit some of them. Let me give you an example.
Let's imagine I work on some embedded project. I have a device my project is targetted to, and I have a development board based on a slightly different model. Working on fixing some bug in the project, not really affected by those MCU differences, I changed my Makefile to default to my development board and I also changed a startup file to make that bug happen every time I reset the MCU. $ fossil status ... EDITED Makefile EDITED state1.c EDITED state2.c EDITED state_machine.c Here, Makefile and state_machine have my local changes, needed while I am working on that bug. I would like to see that in the output of status and I would like to be able to commit only needed changes: $ fossil cl add build Makefile $ fossil cl add tmp state_machine.c $ fossil cl add bug300 state1.c state2.c $ fossil status ... --- Changelist build EDITED Makefile --- Changelist tmp EDITED state_machine.c --- Changelist bug300 EDITED state1.c EDITED state2.c $ fossil commit --cl bug300 $ fossil revert --cl tmp After I'm done, I still want to have Makefile change, as I am going to continue to work on the project on the same development board. Sure, this example is a little bit too simple, but you get the idea. Unfortunately, it could not be stopped easily with branhces. Cheers, Nikita On Fri, Oct 21, 2016 at 12:53 PM Andy Bradford < amb-sendok-1479671619.hiacmifddnkpomfcb...@bradfords.org> wrote: > Thus said Nikita Borodikhin on Fri, 21 Oct 2016 16:02:33 -0000: > > > == change sets - preparing the change == > > > > I often end up having several sets of unrelated changes. For example, > > one set is my temporary change to the build system to disable some > > things to make build process faster, but these changes are not > > intended to come into the end product and are not to be committed. > > You could simply open a new checkout and keep unrelated changes in > different checkouts of your repository. For example, > > fossil new /tmp/test.fossil > mkdir /tmp/tinker && cd /tmp/tinker && fossil open /tmp/test.fossil > mkdir /tmp/explore && cd /tmp/explore && fossil open /tmp/test.fossil > mkdir /tmp/maybe && cd /tmp/maybe && fossil open /tmp/test.fossil > > Etc... > > > svn cl syntax is inconsistent, but I root for the idea to label > > connected files for the commit/review purpose and I would love to have > > something like that in Fossil > > By ``label connected files'' I assume you mean related changes. If > you're already doing the above suggestion, there's always the option to > stash the changes. > > Andy > -- > TAI64 timestamp: 40000000580a7267 > > >
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
