# HG changeset patch
# User Patrick Mezard <patrick@mezard.eu>
# Date 1343925220 -7200
# Node ID ef8d612bebe75c9935a445cd87e9997683cbb766
# Parent  32e9d63d9ba61516e63343aa1138379cde65fbd2# Parent  e15765c18ebc18448addb955d2b698c75fc8b380
Merge with stable

diff -r e15765c18ebc -r ef8d612bebe7 mercurial/context.py
--- 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