1. 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
  2. 22 Oct, 2020 2 commits
  3. 11 Oct, 2020 2 commits
  4. 26 Nov, 2020 3 commits
  5. 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
  6. 23 Nov, 2020 1 commit
  7. 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
  8. 16 Nov, 2020 1 commit
  9. 11 Nov, 2020 1 commit
  10. 29 Oct, 2020 1 commit
  11. 31 Oct, 2020 7 commits
  12. 30 Oct, 2020 2 commits
  13. 28 Oct, 2020 1 commit
  14. 25 Oct, 2020 1 commit
  15. 24 Oct, 2020 3 commits
  16. 14 Oct, 2020 3 commits
  17. 20 Oct, 2020 1 commit
  18. 14 Oct, 2020 1 commit
    • Pierre-Yves David's avatar
      topic: add a `exp….topic.linear-merge` option to allow some oedipus · 3946ee4ee3ae
      Pierre-Yves David authored
      If this option is set to `from-branch`, a user can call `hg merge some-topic`
      from a bare branch even if `some-topic` is a direct descendant of the current
      working copy parents. This was previously denied if the changesets was on the
      same branch, since the result would be an "oedipus merge".
      
      Some user have been requesting this, and this type of merge is one of Gitlab
      standard way of merging a "Merge Request". That new option will unlock issue
      `heptapod#200` and make this mode available for those who wants it.
      3946ee4ee3ae
  19. 15 Oct, 2020 1 commit
  20. 12 Oct, 2020 2 commits
  21. 11 Oct, 2020 1 commit
  22. 07 Oct, 2020 1 commit
    • Sietse Brouwer's avatar
      ngtip: fix TypeError: make revset from revs, not nodes (issue6405) · e25394b6d021
      Sietse Brouwer authored
      This commit does two things:
      
      - Firstly, it tweaks the ngtip revset test to exercise the -G/--graph
        flag. This successfully triggers the bug when it is present.
      - Secondly, it changes the `ngtip` revset to return a revset made from
        integer revs instead of node hash bytes. The test now passes.
      
      Details: The TypeError was triggered by running
      
          hg log -r 'ngtip("default")' --graph
      
      in a repository with more than one changeset. The --graph tag caused the
      flow of control to call `reachableroots2` with the changeset ID found by
      the `ngtip` revset. Because the changeset ID was a node hash (bytes)
      instead of a rev (int), reachableroots2 raised the following error:
      
          TypeError: an integer is required (got type bytes)
      
      --HG--
      branch : stable
      e25394b6d021
  23. 26 Sep, 2020 1 commit
  24. 25 Sep, 2020 1 commit