If you have a long series to rebase, you might get to a point where you can't figure out what to do next, but you've done a lot of work, and want to keep that work (including the future associated obsolete markers). Today, you can't, you have to complete your series or abandon it. I'm rebasing 78 linear commits. My rebasestate has ~70 items. It is really unfortunate to be forced to either give up, or make a new repo just because one is stuck and can't keep the work one has already done. durin42 proposed "hg rebase --abort --keep", but that won't work, since I actually do want to obsolete the original commits. The flag I want is probably not generally possible w/o obsolete markers, as there's no way to destroy commits and keep their descendants otherwise. It could work in cases where you have a non linear graph that you're rebasing: o e o d | o c | | o b |/ o a If I'm rebasing ((a::)-a) onto e, I should be able to stop at: o d' | o c' | o e o b | o a But supporting that case is less urgent. I think if someone is in this position they can be forced to temporarily accept obsolete markings, and use them long enough to get out of this place. They might even learn to like them...
Perhaps --stop.
+1, I really like the ability of evolve to stop anywhere. The main issue with rebase --stop is that, without evolution, we cannot clean up the already rebased revision. We can decide to ignore that issue or to only enable --stop when evolution is on (allowunstable flavor). The "evolution only" do not have any drawback and would be a good first step.
Thinking about it, technically, the other form could be: create a strip bundle and offer: pull --rebase rebase-bundle.hg. Not ideal, but somewhat workable. (Better if we leave a file w/ notes.)
Bug was inactive for 290 days, archiving
Not yet implemented
Bug was inactive for 151 days, archiving
Bug was inactive for 150 days, archiving
Fixed by https://mercurial-scm.org/repo/hg/rev/cc37009e95ca Sushil khanchi <sushilkhanchi97@gmail.com> rebase: add --stop option to stop rebase at any point (issue5206) Before this patch, during a rebase if you get a point where you can't figure out what to do next, then either you had to complete your series or abandon all the work you have done during this rebase. Now, with this feature you can stop at any point by keeping the rebased csets and mark original csets as obsolete. And if you don't have evolution extension enabled then you can use --keep option as an alternative which will keep original csets too, instead of marking them obsolete. Differential Revision: https://phab.mercurial-scm.org/D3959 (please test the fix)
Bug was set to TESTING for 7 days, resolving