##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API)...
mergestate: replace `addmergedother()` with generic `addcommitinfo()` (API) Storing that a file is resolved for the other parent while merging is just one case of things we will like to store in the mergestate. There are more which we will like to store. This patch replaces `addmergedother()` with a much more generic `addcommitinfo()`. Doing this, we also blinding stores the same key value pair generated by the merge code instead of touching them. Differential Revision: https://phab.mercurial-scm.org/D8923
Martin von Zweigbergk - - Load All Authors

File last commit:

r43994:a825ba8e stable
r45945:05d19ca3 default
Show More
5.2
30 lines | 897 B | application/x-troff | GroffLexer
/ relnotes / 5.2
History | Annotation | Raw |Copy content |Copy permalink
== New Features ==
* The amend extension supports the `--currentuser` argument.
* The amend extension supports the `--close-branch` argument.
* The amend extension supports the `--secret` argument.
* The uncommit extension supports the `rewrite.update-timestamp` config option.
== New Experimental Features ==
== Bug Fixes ==
== Backwards Compatibility Changes ==
* A shell that supports `$(command)`` syntax for command substitution is now
required for running the test suite. The test runner normally uses
`sh`, so if that is a shell that doesn't support `$(command)` syntax,
you can override it by setting `$HGTEST_SHELL` or by passing it to
`run-tests.py --shell <shell>`.
* The (experimental) narrow extension's wire protocol changed. If
you're using it, you'll need to make sure to upgrade server and
client at the same time.
== Internal API Changes ==