martinvonz added a comment.
In https://phab.mercurial-scm.org/D5801#87300, @mharbison72 wrote: > In https://phab.mercurial-scm.org/D5801#87296, @martinvonz wrote: > > > I noticed another bug and sent https://phab.mercurial-scm.org/D5978. Maybe your test failure is because you're using the eol extension? I don't know what else would cause the \r in contrib.perf. I have no idea how that's related to this patch, though. > > > The \r is how output normally is on Windows. The test harness accounts for this when matching lines, but displays the actual output (with \r) when there are differences. The eol extension isn’t configured on this machine, but the custom HGRCPATH content from the test harness would override that anyway. Ah, so the only difference is the extra "import newer module separately in try clause for early Mercurial" in `contrib/perf.py` then. This patch didn't change that file. Can you check again that it was this patch that caused that and that it's not just flaky? In https://phab.mercurial-scm.org/D5801#87300, @mharbison72 wrote: > In https://phab.mercurial-scm.org/D5801#87296, @martinvonz wrote: > > > I noticed another bug and sent https://phab.mercurial-scm.org/D5978. Maybe your test failure is because you're using the eol extension? I don't know what else would cause the \r in contrib.perf. I have no idea how that's related to this patch, though. > > > The \r is how output normally is on Windows. The test harness accounts for this when matching lines, but displays the actual output (with \r) when there are differences. The eol extension isn’t configured on this machine, but the custom HGRCPATH content from the test harness would override that anyway. REPOSITORY rHG Mercurial REVISION DETAIL https://phab.mercurial-scm.org/D5801 To: martinvonz, #hg-reviewers Cc: mharbison72, mercurial-devel _______________________________________________ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
