Mercurial > public > mercurial-scm > hg

diff 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
line wrap: on
line diff
--- a/relnotes/next	Mon May 18 12:45:45 2020 -0400
+++ b/relnotes/next	Mon May 18 14:59:59 2020 -0400
@@ -11,3 +11,6 @@
 
  * logcmdutil.diffordiffstat() now takes contexts instead of nodes.
 
+ * The `mergestate` class along with some related methods and constants have
+   moved from `mercurial.merge` to a new `mercurial.mergestate` module.
+