comparison tests/test-merge-force.t @ 34936:9645c2a2bc2a stable

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.
author Matt Harbison <matt_harbison@yahoo.com>
date Thu, 19 Oct 2017 23:16:48 -0400
parents 75be14993fda
children 41ef02ba329b
comparison
equal deleted inserted replaced
34935:ffeea2406276 34936:9645c2a2bc2a