This revision was automatically updated to reflect the committed changes. Closed by commit rHG2f3eae30719a: context: check file exists before getting data from _wrappedctx (authored by pulkit, committed by ).
REPOSITORY rHG Mercurial CHANGES SINCE LAST UPDATE https://phab.mercurial-scm.org/D6308?vs=14913&id=14916 REVISION DETAIL https://phab.mercurial-scm.org/D6308 AFFECTED FILES mercurial/context.py tests/test-rebase-inmemory.t CHANGE DETAILS diff --git a/tests/test-rebase-inmemory.t b/tests/test-rebase-inmemory.t --- a/tests/test-rebase-inmemory.t +++ b/tests/test-rebase-inmemory.t @@ -797,5 +797,9 @@ $ hg rebase -r . -d 1 --config ui.merge=internal:merge3 rebasing 2:fb62b706688e "add b to foo" (tip) merging foo - abort: foo.orig@e780cf6f9041: not found in manifest! - [255] + hit merge conflicts; re-running rebase without in-memory merge + rebasing 2:fb62b706688e "add b to foo" (tip) + merging foo + warning: conflicts while merging foo! (edit, then use 'hg resolve --mark') + unresolved conflicts (see hg resolve, then hg rebase --continue) + [1] diff --git a/mercurial/context.py b/mercurial/context.py --- a/mercurial/context.py +++ b/mercurial/context.py @@ -1824,7 +1824,7 @@ def data(self, path): if self.isdirty(path): if self._cache[path]['exists']: - if self._cache[path]['data']: + if self._cache[path]['data'] is not None: return self._cache[path]['data'] else: # Must fallback here, too, because we only set flags. To: pulkit, #hg-reviewers Cc: martinvonz, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel