tests/test-simplemerge.py.out
author Matt Harbison <matt_harbison@yahoo.com>
Thu, 19 Oct 2017 23:16:48 -0400
branchstable
changeset 34936 9645c2a2bc2a
parent 22023 f18830651811
permissions -rw-r--r--
test-arbitraryfilectx: stabilize for Windows Previously, the second last test (context.arbitraryfilectx(..)) returned True on Windows. I changed the repo setup sequence to import a patch, so that way the repo would have a proper symlink. That made the last test fail, since it is comparing files in wdir(), one of which is not the expected symlink. Apparently the (feature !) line matching doesn't work well with (no-eol), so I had to conditionalize the test instead of the output.

................
----------------------------------------------------------------------
Ran 16 tests in 0.000s

OK