Fri, 08 Dec 2017 12:14:38 -0800 rebase: rerun a rebase on-disk if IMM merge conflicts arise
Phil Cohen <phillco@fb.com> [Fri, 08 Dec 2017 12:14:38 -0800] rev 35320
rebase: rerun a rebase on-disk if IMM merge conflicts arise Differential Revision: https://phab.mercurial-scm.org/D1249
Thu, 07 Dec 2017 22:35:43 -0800 rebase: add concludememorynode(), and call it when rebasing in-memory
Phil Cohen <phillco@fb.com> [Thu, 07 Dec 2017 22:35:43 -0800] rev 35319
rebase: add concludememorynode(), and call it when rebasing in-memory Differential Revision: https://phab.mercurial-scm.org/D1248
Thu, 07 Dec 2017 16:07:06 -0800 rebase: pass the wctx object (IMM or on-disk) to merge.update
Phil Cohen <phillco@fb.com> [Thu, 07 Dec 2017 16:07:06 -0800] rev 35318
rebase: pass the wctx object (IMM or on-disk) to merge.update Differential Revision: https://phab.mercurial-scm.org/D1247
Thu, 07 Dec 2017 16:07:06 -0800 rebase: do not update if IMM; instead, set the overlaywctx's parents
Phil Cohen <phillco@fb.com> [Thu, 07 Dec 2017 16:07:06 -0800] rev 35317
rebase: do not update if IMM; instead, set the overlaywctx's parents Differential Revision: https://phab.mercurial-scm.org/D1246
(0) -30000 -10000 -3000 -1000 -300 -100 -30 -10 -4 +4 +10 +30 +100 +300 +1000 +3000 +10000 tip