Thu, 07 Dec 2017 13:20:47 -0800 rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts
Phil Cohen <phillco@fb.com> [Thu, 07 Dec 2017 13:20:47 -0800] rev 35301
rebaseruntime: raise InMemoryMergeConflictsError on merge conflicts Differential Revision: https://phab.mercurial-scm.org/D1234
Thu, 07 Dec 2017 13:20:47 -0800 rebase: do not bail on uncomitted changes if rebasing in-memory
Phil Cohen <phillco@fb.com> [Thu, 07 Dec 2017 13:20:47 -0800] rev 35300
rebase: do not bail on uncomitted changes if rebasing in-memory Differential Revision: https://phab.mercurial-scm.org/D1233
Thu, 07 Dec 2017 13:25:23 -0800 rebase: add the --inmemory option flag; assign a wctx object for the rebase
Phil Cohen <phillco@fb.com> [Thu, 07 Dec 2017 13:25:23 -0800] rev 35299
rebase: add the --inmemory option flag; assign a wctx object for the rebase In the future, the --inmemory flag might be deprecated in favor of something more intelligent (for example, always rebasing in-memory if the working copy parent isn't in the rebaseset). But we might keep it as a way to explicitly force IMM on or off. Differential Revision: https://phab.mercurial-scm.org/D1232
(0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -3 +3 +10 +30 +100 +300 +1000 +3000 +10000 tip