Mercurial > hg

comparison relnotes/next @ 44856:b7808443ed6a

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mergestate: split out merge state handling code from main merge module There's already some pretty reasonable encapsulation here, but I want to make the mergestate storage a property of the context so memctx instances can do a reasonable thing. This is the first step in a reshuffle to make that easier. Differential Revision: https://phab.mercurial-scm.org/D8550
author Augie Fackler <augie@google.com>
date Mon, 18 May 2020 14:59:59 -0400
parents ba5688e3b3bd
children 61cdc8137d53
comparison
equal deleted inserted replaced
44855:1d2d353e5c4a 44856:b7808443ed6a
9 9
10 == Internal API Changes == 10 == Internal API Changes ==
11 11
12 * logcmdutil.diffordiffstat() now takes contexts instead of nodes. 12 * logcmdutil.diffordiffstat() now takes contexts instead of nodes.
13 13
14 * The `mergestate` class along with some related methods and constants have
15 moved from `mercurial.merge` to a new `mercurial.mergestate` module.
16