Mercurial > hg

changeset 21688:cc677803bad4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
memfilectx: inherit from committablefilectx This patch marks the beginning of having memfilectx become a full-fledged file contex so that we can handle diffing and merging.
author Sean Farley <sean.michael.farley@gmail.com>
date Thu, 15 Aug 2013 15:23:36 -0500
parents da67d855a8a2
children 503bb3af70fe
files mercurial/context.py
diffstat 1 files changed, 1 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/context.py	Thu Aug 15 15:20:56 2013 -0500
+++ b/mercurial/context.py	Thu Aug 15 15:23:36 2013 -0500
@@ -1586,7 +1586,7 @@
         """commit context to the repo"""
         return self._repo.commitctx(self)
 
-class memfilectx(object):
+class memfilectx(committablefilectx):
     """memfilectx represents an in-memory file to commit.
 
     See memctx for more details.