On Tue, Nov 3, 2015 at 7:59 AM, Michal Suchanek <hramr...@gmail.com> wrote:
>
> On 2 November 2015 at 20:40, Richard Hipp <d...@sqlite.org> wrote:
> > But on the other hand, you should not be checking-in untested changes.
> > The proper way to do incremental check-ins is to stash the whole lot,
> > then pull out individual pieces from the stash and test and commit
> > them separately.
>
> And that's what the staging area allows for easily. You add and remove
> hunks from staging area until you like the split and commit the
> staging area at which point CI fires or you stash the remaining
> changes and run your tests. Or you just don't care, of course.
>

I have no trouble using Fossil's stash to do the same. Granted, I'm using
an external gui-diff tool. But wouldn't a dev using Git be using some kind
of "enhanced diff" tool, too?

    $ fossil stash
    $ fossil stash gdiff

Sometimes, it would be nice to specify which files to diff, but usually,
when I need to cherry pick changes, I want to review all the changes,
anyway.

Then I build and test, possibly fix, then commit. Then move on to pull out
the next set of changes.
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Reply via email to