diff tests/test-eolfilename.t @ 17742:405b6bd015df

run-tests: allow test output lines to be terminated with \r in addition to \n str.splitlines could not be used in 546c76e5a3e6, but _now_ we would like to have lines with other line endings than \n. Some fine occurences of (esc) markup of \r is replaced with multiple lines ending with '\r (no-eol) (esc)'. That is no win but also no significant loss. This change makes it possible to drop filtercr.py - _that_ is a win.
author Mads Kiilerich <mads@kiilerich.com>
date Wed, 26 Sep 2012 00:56:27 +0200
parents f2719b387380
children c8709ff57ff2
line wrap: on
line diff
--- a/tests/test-eolfilename.t	Wed Oct 10 01:37:53 2012 +0200
+++ b/tests/test-eolfilename.t	Wed Sep 26 00:56:27 2012 +0200
@@ -9,11 +9,13 @@
   $ A=`printf 'he\rllo'`
   $ echo foo > "$A"
   $ hg add
-  adding he\rllo (esc)
+  adding he\r (no-eol) (esc)
+  llo
   abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
   [255]
   $ hg ci -A -m m
-  adding he\rllo (esc)
+  adding he\r (no-eol) (esc)
+  llo
   abort: '\n' and '\r' disallowed in filenames: 'he\rllo'
   [255]
   $ rm "$A"
@@ -31,7 +33,9 @@
   [255]
   $ echo foo > "$A"
   $ hg debugwalk
-  f  he\rllo  he\rllo (esc)
+  f  he\r (no-eol) (esc)
+  llo  he\r (no-eol) (esc)
+  llo
   f  hell
   o  hell
   o