This revision was automatically updated to reflect the committed changes.
Closed by commit rHG8b2d7684407b: context: rename divergent into
contentdivergent (authored by lothiraldan).
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D240?vs=621=696
REVISION
lothiraldan added inline comments.
INLINE COMMENTS
> lothiraldan wrote in context.py:227
> Damn it you are right, good catch!
Sorry for the tone of my comment, I was only angry against myself, I thought I
have fixed this code too many times due to merge conflicts.
REPOSITORY
rHG Mercurial
lothiraldan updated this revision to Diff 621.
REPOSITORY
rHG Mercurial
CHANGES SINCE LAST UPDATE
https://phab.mercurial-scm.org/D240?vs=585=621
REVISION DETAIL
https://phab.mercurial-scm.org/D240
AFFECTED FILES
mercurial/context.py
CHANGE DETAILS
diff --git a/mercurial/context.py
lothiraldan added inline comments.
INLINE COMMENTS
> indygreg wrote in context.py:227
> This should be `self.contentdivergent()` no?
Damn it you are right, good catch!
REPOSITORY
rHG Mercurial
REVISION DETAIL
https://phab.mercurial-scm.org/D240
To: lothiraldan, #hg-reviewers, indygreg
indygreg requested changes to this revision.
indygreg added inline comments.
This revision now requires changes to proceed.
INLINE COMMENTS
> context.py:227
> +self._repo.ui.deprecwarn(msg, '4.4')
> +return self.orphan()
> +
This should be `self.contentdivergent()` no?
lothiraldan created this revision.
Herald added a subscriber: mercurial-devel.
Herald added a reviewer: hg-reviewers.
REVISION SUMMARY
Rename divergent context method into contentdivergent and add a deprecation
warning on divergent.
Only update all callers to keep the patch
