changeset 17331:ef8d612bebe7

Merge with stable
author Patrick Mezard <patrick@mezard.eu>
date Thu, 02 Aug 2012 18:33:40 +0200
parents 32e9d63d9ba6 (diff) e15765c18ebc (current diff)
children b950b86ac897
files
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/context.py	Thu Aug 02 01:49:36 2012 -0500
+++ b/mercurial/context.py	Thu Aug 02 18:33:40 2012 +0200
@@ -885,8 +885,7 @@
         p = self._repo.dirstate.parents()
         if p[1] == nullid:
             p = p[:-1]
-        self._parents = [changectx(self._repo, x) for x in p]
-        return self._parents
+        return [changectx(self._repo, x) for x in p]
 
     def status(self, ignored=False, clean=False, unknown=False):
         """Explicit status query