1. 25 Aug, 2020 1 commit
  2. 27 Nov, 2020 1 commit
  3. 25 Oct, 2020 1 commit
    • Sushil Khanchi's avatar
      evolve: use 3-way merge to check if only one of them was moved · 65b37900d477
      Sushil Khanchi authored
      While deciding the resolution parent for content-divergence resolution,
      now we use 3-way merge logic to check, if only one of them was moved from its
      original position by applying the logic on following:
      (parent of "base", parent of "divergent", parent of "other")
      
      Before this patch, we always set the parent of ahead one (from the two
      divergent cset) as resolution parent and then make sure both are located
      on resolution parent and perform 3-way merge to get resultant cset.
      
      But now, if the reason behind content-divergence is that one side amended
      some content changes while other moved forward/backward in the dag;
      we set the parent of relocated one as resolution parent and then make sure both
      are on resolution parent and perform 3-way merge.
      
      This patch also adds few new lines to support a case where "one cset moved
      somewhere; other moved to successor of base.p1()"
      
      Changes is test files reflect the changed behavior.
      65b37900d477
  4. 22 Oct, 2020 2 commits
  5. 11 Oct, 2020 2 commits
  6. 26 Nov, 2020 3 commits
  7. 25 Nov, 2020 1 commit
    • Anton Shestakov's avatar
      compat: wrap debugstrip from core hg if it exists · 716063c7a372
      Anton Shestakov authored
      Since the debugstrip command from core and strip command from the hgext.strip
      extension is now the same thing, we don't have to wrap them separately. Unless,
      of course, users have a copy of old (from hg 5.6 and earlier) hgext.strip
      laying around that they specifically want to use, but I don't think we want to
      support that use case.
      716063c7a372
  8. 19 Nov, 2020 1 commit
    • Martin von Zweigbergk's avatar
      tests: update with more detailed exit codes · e5d91fd1f319
      Martin von Zweigbergk authored
      CORE-TEST-OUTPUT-UPDATE: 21733e8c924f
      CORE-TEST-OUTPUT-UPDATE: 8d72e29ad1e0
      CORE-TEST-OUTPUT-UPDATE: e0dbfbd4062c
      CORE-TEST-OUTPUT-UPDATE: ebee234d952a
      CORE-TEST-OUTPUT-UPDATE: 527ce85c2e60
      CORE-TEST-OUTPUT-UPDATE: 3175b0e0058b
      CORE-TEST-OUTPUT-UPDATE: f96fa4de5055
      CORE-TEST-OUTPUT-UPDATE: 96ca817ec192
      e5d91fd1f319
  9. 16 Nov, 2020 1 commit
  10. 23 Nov, 2020 1 commit
  11. 11 Nov, 2020 1 commit
  12. 23 Aug, 2020 1 commit
  13. 05 Jul, 2020 1 commit
  14. 09 Nov, 2020 5 commits
  15. 23 Aug, 2020 1 commit
  16. 05 Jul, 2020 1 commit
  17. 12 Nov, 2020 1 commit
  18. 11 Nov, 2020 5 commits
  19. 29 Oct, 2020 1 commit
  20. 31 Oct, 2020 7 commits
  21. 30 Oct, 2020 2 commits