4 ms·
With Fossil you could create many private branches off your feature branch with your experiments, and merge them into your feature branch when you're satisfied
by rkeene2 7y ago
With Fossil you could create many private branches off your feature branch with your experiments, and merge them into your feature branch when you're satisfied with that experiment.
- theamk 7y agothat's the thing -- I'll be making 6-8 different branches out of that experimental branch. In rebase world, I have a cycle of "cherry-pick a few changes, get them into master, rebase experimental so it gets smaller; repeat until nothing is left of experimental" In permanent world, I guess I have two worktrees and copy files one-by-one, manually?
- hinkley 7y agoSeems like you should be able to write a 'rebase' tool that just does a sequential cherry-pick...
- theamk 7y agoThat's git's rebase with --onto and --interactive flags, I already use it and it is great. The question is, why would people give this up and move to Fossil?
- josephg 7y agoWhy can't we have both? It seems like both "an immutable view of what happened" and "a crafted narrative of feature changes, bug fixes and releases" are useful. Its ridiculous that I'm expected to pick one. Git and fossil should raise their game. (Yes; git's tooling supports either approach, but not both at the same time. A better tool would let me avoid making this tradeoff at all.)
- hinkley 7y agoI'm saying rebase --onto is doable in Fossil. Whether it's built-in is another question.