quark added a comment.
If it's just file and directory conflict, maybe we can encode the path so it becomes impossible to have such conflict. See `_encodedir` in `store.py` for an example. It requires a suffix so partially reverts https://phab.mercurial-scm.org/D679 though. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D680 To: mbthomas, ryanmce, #hg-reviewers, durham, yuja, ikostia Cc: quark, ikostia, yuja, durham, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
