This instance will be upgraded to Heptapod 0.21.0rc2 on 2021-04-16 at 14:00 UTC+2 (a few minutes of down time)

  1. 22 Oct, 2020 2 commits
  2. 27 Oct, 2020 1 commit
  3. 13 Jul, 2020 1 commit
  4. 15 Jul, 2019 1 commit
    • Taapas Agrawal's avatar
      continue: added support for rebase · 35ebdbb38efb
      Taapas Agrawal authored
      This adds support of rebase to hg continue plan.
      An independent continue logic for rebase is created
      under continuerebase() function. For this a seperate
      rebaseruntime object is created under the function to
      handle an interrupted rebasestate.
      Results of tests are shown.
      Differential Revision:
  5. 10 Jan, 2020 1 commit
    • Martin von Zweigbergk's avatar
      rebase: don't use rebased node as dirstate p2 (BC) · 9c9cfecd4600
      Martin von Zweigbergk authored
      When rebasing a node, we currently use the rebased node as p2 in the
      dirstate until just before we commit it (we then change to the desired
      parents). This p2 is visible to the user when the rebase gets
      interrupted because of merge conflicts. That can be useful to the user
      as a reminder of which commit is currently being rebased, but I
      believe it's incorrect for a few reasons:
       * I think the dirstate parents should be the ones that will be set
         when the commit is created.
       * I think having two parents means that you're merging those two
         commits, but when rebasing, you're generally grafting, not merging.
       * When rebasing a merge commit, we should use the two desired parents
         as dirstate parents (and we clearly can't have the rebased node as
         a third dirstate parent).
       * `hg graft` (and `hg update --merge`) sets only one parent and `hg
         rebase` should be consistent with that.
      I realize that this is a somewhat large user-visible change, but I
      think it's worth it because it will simplify things quite a bit.
      Differential Revision:
  6. 09 Mar, 2018 3 commits
  7. 06 Oct, 2017 1 commit