1. 16 Jul, 2020 1 commit
  2. 31 Aug, 2019 1 commit
  3. 23 Jun, 2020 1 commit
  4. 25 Jun, 2020 3 commits
  5. 28 Jun, 2020 1 commit
  6. 02 Jun, 2020 1 commit
    • Yuya Nishihara's avatar
      graft: fix --base value to be saved in state file · 2dc5ae953c4a
      Yuya Nishihara authored
      'True' just works because it is treated as an integer revision '1' and
      only the truthiness of the basectx is important. If multiple source revisions
      were supported with --base, the resumed graft operation would go wrong.
      
      --HG--
      branch : stable
      2dc5ae953c4a
  7. 26 May, 2020 1 commit
  8. 14 Apr, 2020 1 commit
  9. 01 Mar, 2020 1 commit
    • Manuel Jacob's avatar
      branch: make --force work even when specifying revs · 92b7caf4cb9e
      Manuel Jacob authored
      The `hg branch` command accepts a `--force` parameter that allows to
      "set branch name even if it shadows an existing branch". However, before this
      patch, that didn’t work when specifying revs with `-r`.
      
      --HG--
      branch : stable
      92b7caf4cb9e
  10. 25 May, 2020 1 commit
  11. 18 May, 2020 1 commit
  12. 17 May, 2020 3 commits
  13. 07 May, 2020 2 commits
  14. 08 May, 2020 2 commits
  15. 21 Apr, 2020 1 commit
  16. 09 Apr, 2020 1 commit
    • Pulkit Goyal's avatar
      mergestate: store about files resolved in favour of other · 1b8fd4af3318
      Pulkit Goyal authored
      Committing a merge sometimes wrongly creates a new filenode where it can re-use
      an existing one. This happens because the commit code does it's own calculation
      and does not know what happened on merge.
      
      This starts storing information in mergestate about files which were
      automatically merged and the other/remote version of file was used.
      We need this information at commit to pick the filenode parent for the new
      commit.
      
      This issue was found by Pierre-Yves David and idea to store the relevant parts
      in mergestate is also suggested by him.
      
      Somethings which can be further investigated are:
      
      1) refactoring of commit logic more to depend on this information
      2) maybe a more generic solution?
      
      Differential Revision: https://phab.mercurial-scm.org/D8392
      1b8fd4af3318
  17. 25 Jan, 2020 1 commit
  18. 22 Jan, 2020 1 commit
  19. 28 Dec, 2019 2 commits
  20. 30 Dec, 2019 1 commit
  21. 27 Dec, 2019 1 commit
  22. 12 Dec, 2019 1 commit
    • Martin von Zweigbergk's avatar
      config: drop debug messages saying where config was read from · 6b6872822b32
      Martin von Zweigbergk authored
      `hg config --debug` includes lines like this:
      
        set config by: $EDITOR
      
      but also lines like this:
      
        $EDITOR: ui.editor=emacs -nw
      
      The `set config by` messages don't seem to provide much additional
      information over what we get from the `$EDITOR:`-type message. I could
      imagine wanting to see which values got overriden by a later entry,
      but that information is already not present. So let's just remove the
      first type of output. My next patch would otherwise amplify the
      redundant output (there would be one `set config by` for each line in
      `mergetools.rc`).
      
      Differential Revision: https://phab.mercurial-scm.org/D7627
      6b6872822b32
  23. 13 Dec, 2019 3 commits
  24. 12 Dec, 2019 4 commits
  25. 10 Dec, 2019 3 commits
  26. 27 Oct, 2019 1 commit