On Aug 3, 2015, at 1:08 PM, Andy Goth <[email protected]> wrote:
>
> On 7/28/2015 9:18 PM, Warren Young wrote:
>> On Jul 28, 2015, at 9:32 AM, Gour <[email protected]> wrote:
>>> split commit within one file
>>
>> it would be spiffy to have a “fossil ci —cherrypick” option
>
> ...it's a bad idea...each commit ought to first be tested..."fossil stash
> save”
Okay, how about this design, then:
$ fossil stash save -m “several unrelated changes”
$ fossil stash apply --partial
...fossil interactively asks whether to apply each diff chunk
$ make test && vi && make test && vi...
$ fossil ci -m “one coherent change”
$ fossil stash apply --partial
...another interrogation, skipping previously-applied chunks
$ make test && fossil ci -m “a second coherent change”
...GOTO 10 :)
If you say “apply --partial” and Fossil sees that all stashed chunks are
already applied, it could implicitly do “stash pop” instead, since there is no
data loss.
If you go through an “apply --partial” pass and accept none of the offered diff
chunks, it could just ask if you meant to say “stash pop”, but not do it
automatically.
_______________________________________________
fossil-users mailing list
[email protected]
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
