1. 20 Dec, 2019 2 commits
  2. 19 Dec, 2019 1 commit
  3. 20 Dec, 2019 1 commit
  4. 27 Nov, 2019 3 commits
  5. 25 Nov, 2019 2 commits
  6. 12 Dec, 2019 2 commits
  7. 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
  8. 09 Dec, 2019 6 commits
  9. 12 Dec, 2019 1 commit
  10. 10 Dec, 2019 2 commits
  11. 06 Dec, 2019 1 commit
  12. 05 Dec, 2019 1 commit
  13. 04 Dec, 2019 2 commits
  14. 03 Dec, 2019 1 commit
  15. 22 Nov, 2019 1 commit
  16. 21 Nov, 2019 1 commit
  17. 18 Nov, 2019 3 commits
  18. 17 Nov, 2019 1 commit
  19. 16 Nov, 2019 1 commit
  20. 18 Nov, 2019 3 commits
  21. 16 Nov, 2019 2 commits
  22. 15 Nov, 2019 1 commit