##// END OF EJS Templates
documentation: add some internals documentation about bid merge...
documentation: add some internals documentation about bid merge This is an important algorithm that was only documented on the wiki so far. Some update to the algorithm (and associated doc) is to expected in the future since the bid merge algorithm is bug-ridden when it comes to file deletion comes to play. Differential Revision: https://phab.mercurial-scm.org/D8711

File last commit:

r45530:c2df0bca default
r45605:6c22f3ab default
Show More
next
31 lines | 1.2 KiB | text/plain | TextLexer
Martin von Zweigbergk
releasenotes: add a file in which to record release notes...
r42457 == New Features ==
Martin von Zweigbergk
debugmergestate: make templated...
r44880
Martin von Zweigbergk
copy: add experimental support for marking committed copies...
r44847 == New Experimental Features ==
Martin von Zweigbergk
revset: add a revset for parents in merge state...
r44817
Valentin Gatien-Baron
relnotes: advertize the possibility to use rust...
r45441 * The core of some hg operations have been (and are being)
implemented in rust, for speed. `hg status` on a repository with
300k tracked files goes from 1.8s to 0.6s for instance.
This has currently been tested only on linux, and does not build on
windows. See rust/README.rst in the mercurial repository for
instructions to opt into this.
Valentin Gatien-Baron
exchange: turn on option that makes concurrent pushes work better...
r44896
Martin von Zweigbergk
releasenotes: add a file in which to record release notes...
r42457 == Backwards Compatibility Changes ==
Manuel Jacob
relnotes: note that we now require modern SSL/TLS features in Python
r45423 * Mercurial now requires at least Python 2.7.9 or a Python version that
Manuel Jacob
setup: require that Python has TLS 1.1 or TLS 1.2...
r45429 backported modern SSL/TLS features (as defined in PEP 466), and that Python
was compiled against a OpenSSL version supporting TLS 1.1 or TLS 1.2
(likely this requires the OpenSSL version to be at least 1.0.1).
Manuel Jacob
relnotes: note that we now require modern SSL/TLS features in Python
r45423
Manuel Jacob
perf: make `hg perfwrite` more flexible...
r45530 * The `hg perfwrite` command from contrib/perf.py was made more flexible and
changed its default behavior. To get the previous behavior, run `hg perfwrite
--nlines=100000 --nitems=1 --item='Testing write performance' --batch-line`.
Martin von Zweigbergk
debugmergestate: make templated...
r44880
Martin von Zweigbergk
releasenotes: add a file in which to record release notes...
r42457 == Internal API Changes ==
Augie Fackler
relnotes: add API change note per request in D8502...
r45380 * logcmdutil.diffordiffstat() now takes contexts instead of nodes.
Augie Fackler
mergestate: split out merge state handling code from main merge module...
r45383 * The `mergestate` class along with some related methods and constants have
moved from `mercurial.merge` to a new `mercurial.mergestate` module.