Mercurial > public > mercurial-scm > hg-stable
diff mercurial/context.py @ 18036:8b846dbc57b6
merge: support calculating merge actions against non-working contexts
This is not currently used. It is instead a pre-requisite to
performing non-conflicting grafts in memory, which a subsequent patch
will do.
author | David Schleimer <dschleimer@fb.com> |
---|---|
date | Tue, 04 Dec 2012 12:54:18 -0800 |
parents | aba3c161bcc6 |
children | 03604f46d48a |
line wrap: on
line diff
--- a/mercurial/context.py Tue Dec 04 12:54:18 2012 -0800 +++ b/mercurial/context.py Tue Dec 04 12:54:18 2012 -0800 @@ -355,6 +355,9 @@ def dirs(self): return self._dirs + def dirty(self): + return False + class filectx(object): """A filecontext object makes access to data related to a particular filerevision convenient."""