1. 27 Nov, 2019 1 commit
  2. 25 Nov, 2019 2 commits
  3. 12 Dec, 2019 2 commits
  4. 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
    • 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).
  5. 09 Dec, 2019 6 commits
  6. 12 Dec, 2019 1 commit
  7. 10 Dec, 2019 2 commits
  8. 06 Dec, 2019 1 commit
  9. 05 Dec, 2019 1 commit
  10. 04 Dec, 2019 2 commits
  11. 03 Dec, 2019 1 commit
  12. 22 Nov, 2019 1 commit
  13. 21 Nov, 2019 1 commit
  14. 18 Nov, 2019 3 commits
  15. 17 Nov, 2019 1 commit
  16. 16 Nov, 2019 1 commit
  17. 18 Nov, 2019 3 commits
  18. 16 Nov, 2019 2 commits
  19. 15 Nov, 2019 2 commits
  20. 13 Nov, 2019 2 commits
  21. 10 Nov, 2019 3 commits
    • Anton Shestakov's avatar
      docs: add SVG figures for sharing.rst · 0d1893c1044c
      Anton Shestakov authored
      Generated by graphviz loosely based on .dot files produced by dotgraph
      branch : stable
    • Anton Shestakov's avatar
      docs: add some up-to-date output from push/pull commands · deec516b6e34
      Anton Shestakov authored
      Hopefully it's going to be helpful for users to better understand how evolve
      branch : stable
    • Anton Shestakov's avatar
      docs: add two more amend commits to simulate temporary amend commits · 3874bc10d4a7
      Anton Shestakov authored
      sharing.rst made reference to temporary amend commits and used them to
      demonstrate that hidden commits are not exchanged. Nowadays, evolve doesn't
      create such commits, but it still makes sense to show how they are handled
      during the exchange process. So let's add two more amend commits, one for each
      repo. This way the guide doesn't have to be updated too much, but doesn't lose
      this important detail of working with evolve.
      Unfortunately, this means that tons of hashes change, but it's better than to
      have figure 4 demonstrate absolutely nothing.
      Temporary amend commits were removed from test-sharing.t in 06844693bb21,
      but sharing.rst continued using them for demonstration purposes. It might've
      been better to replace at least some of the temporary amend commits by extra
      amends back then, but oh well.
      branch : stable