lothiraldan added a comment.
According to my understanding of `context.troubles`, a changeset could be both content-divergent and phase-divergent, it should be easy to add a test for that. About phase-divergent name, I like it, it's both explicit and coherent with the other terms. Maybe this discussion already happened in one medium listed here: https://www.mercurial-scm.org/wiki/CEDVocabulary#See_Also I think phases are more or less visible depending on your workflow, hiding it would not be possible for everyone I'm afraid. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D216 To: lothiraldan, #hg-reviewers Cc: martinvonz, quark, durin42, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel