Read about our upcoming Code of Conduct on this issue

This instance was upgraded to Heptapod 0.28.0 today

  1. 20 Dec, 2019 1 commit
  2. 19 Dec, 2019 3 commits
  3. 09 Dec, 2019 4 commits
  4. 06 Nov, 2019 1 commit
    • Sushil Khanchi's avatar
      evolve: extract logic of pre-checking divergence risk to its own function · f583d9eedbce
      Sushil Khanchi authored
      Extracting the logic (which is used to check if rewriting an obsolete
      revision will create divergence) to a function. This function will be used
      in upcoming patches of pre-checking.
      
      This is how we check if rewriting an obsolete revision will create
      divergence. We need to check two cases:
      If there is any
      1)  non-obsolete successor.
            -> easily done by `obsutil.successorssets()`
      2)  precursor with non-obsolete successor.
            -> using `evolvecmd.divergentsets()`
      f583d9eedbce
  5. 26 Dec, 2019 2 commits
  6. 20 Dec, 2019 4 commits
  7. 10 Dec, 2019 3 commits
  8. 01 Dec, 2019 1 commit
  9. 26 Dec, 2019 3 commits
  10. 28 Nov, 2019 2 commits
  11. 27 Nov, 2019 1 commit
  12. 20 Dec, 2019 2 commits
  13. 19 Dec, 2019 1 commit
  14. 20 Dec, 2019 1 commit
  15. 27 Nov, 2019 3 commits
  16. 25 Nov, 2019 2 commits
  17. 12 Dec, 2019 2 commits
  18. 19 Nov, 2019 2 commits
    • Martin von Zweigbergk's avatar
      evolve: delete redundant and incorrect code for updating dirstate · 04104042c6ad
      Martin von Zweigbergk authored
      In relocate() when we notice conflicts, we will try to fix up the
      dirstate by calling copies.duplicatecopies() and
      dirstatedance(). However, we had called _evolvemerge() just before
      that point and that has already fixed up the dirstate, so there's no
      need to do it again. Also, we did it incorrectly as the test case
      shows.
      04104042c6ad
    • Martin von Zweigbergk's avatar
      tests: demonstrate how evolve loses transitive copies when interrupted · effce0a1f5bd
      Martin von Zweigbergk authored
      Let's say `b` has been renamed to `c` in commit A and then renamed
      to `d` in commit B. We now modify A in a way that will cause a
      conflict when we evolve B. `hg evolve` will now stop and let the user
      resolve the conflicts, but it will have lost the copy information in
      the working copy (should still be c->d).
      effce0a1f5bd
  19. 09 Dec, 2019 2 commits