1. 14 Oct, 2020 3 commits
  2. 20 Oct, 2020 1 commit
  3. 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
  4. 15 Oct, 2020 1 commit
  5. 12 Oct, 2020 2 commits
  6. 11 Oct, 2020 1 commit
  7. 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
  8. 26 Sep, 2020 1 commit
  9. 25 Sep, 2020 3 commits
  10. 24 Sep, 2020 4 commits
  11. 14 Oct, 2020 1 commit
  12. 10 Oct, 2020 1 commit
  13. 22 Sep, 2020 3 commits
  14. 10 Oct, 2020 2 commits
  15. 09 Oct, 2020 1 commit
  16. 18 Sep, 2020 1 commit
  17. 17 Sep, 2020 1 commit
  18. 26 Aug, 2020 4 commits
  19. 17 Sep, 2020 3 commits
  20. 10 Sep, 2020 1 commit
  21. 05 Sep, 2020 2 commits
    • Matt Harbison's avatar
      config: specify the extension when forcing a config option · 1ee535d769db
      Matt Harbison authored
      I noticed that `hg config server --debug` said 'none: server.bundle1=False'.
      
      --HG--
      branch : stable
      1ee535d769db
    • Matt Harbison's avatar
      tests: use the modern config setting to enable evolution in topic tests · 044ce00dfa88
      Matt Harbison authored
      When adding `hg pick --config extensions.evolve=` to test-topic-dest.t to
      investigate issue6406, it failed with `abort: unknown command 'pick'`.  This is
      a manifestation of issue6039.  I made several attempts at determining the root
      cause, and while I'm still worried about *why* a config setting can cause the
      extension to fail to fully initialize, there are some topic bugs to cleanup and
      I don't feel like spending more time on this.
      
      --HG--
      branch : stable
      044ce00dfa88
  22. 08 Sep, 2020 2 commits