Skip to content
Snippets Groups Projects
  1. Oct 30, 2020
  2. Oct 28, 2020
  3. Sep 19, 2020
    • Anton Shestakov's avatar
      evolve: clean merge state when content divergence resolution has no changes · 5673730d
      Anton Shestakov authored
      This patch backs out b723805d7fe1, which only hid the problem.
      
      Usually mergestate is cleared (or should be cleared) when creating a new
      changeset, but sometimes there are situations when there's nothing to commit.
      
      When solving content divergence resulted in no changes and no new changesets
      were created, mergestate was left untouched. That's a problem because sometimes
      mergestate contains files with conflicts that were already resolved by user,
      and such mergestate only applies to the current wdir parent. Since evolve has
      already dealt with the current wdir parent successfully when it reached this
      code, this is a good place to clean the mergestate.
      5673730d
  4. Oct 25, 2020
  5. Oct 24, 2020
  6. May 08, 2020
  7. Oct 09, 2020
  8. Oct 02, 2020
  9. Sep 25, 2020
  10. Oct 14, 2020
  11. Oct 20, 2020
  12. Oct 12, 2020
  13. Oct 07, 2020
    • Sietse Brouwer's avatar
      ngtip: fix TypeError: make revset from revs, not nodes (issue6405) · e25394b6
      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)
      e25394b6
  14. Oct 14, 2020
    • Pierre-Yves David's avatar
      topic: add a `exp….topic.linear-merge` option to allow some oedipus · 3946ee4e
      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.
      3946ee4e
  15. Oct 15, 2020
  16. Oct 11, 2020
  17. Oct 12, 2020
  18. Sep 26, 2020
  19. Sep 25, 2020
  20. Sep 24, 2020
  21. Oct 14, 2020
  22. Oct 10, 2020
  23. Sep 22, 2020
  24. Oct 10, 2020
  25. Oct 09, 2020
  26. Sep 17, 2020
Loading