annotate tests/test-eol-update.t @ 15163:f4bc0b9e03a4 stable

building: build inotify for sys.platform='linux*' If Python interpreter was built under Linux 3.x kernel, it reports sys.platform to be 'linux3' (it is fixed for Python 3, but not for 2.x). This cancels building inotify extension, which was built only for 'linux2' platform. Improved test checks if sys.platform begins with 'linux', and together with test for kernel version to be greater than 2.6 it seems to cover all known cases.
author Nikolaj Sjujskij <sterkrig@myopera.com>
date Tue, 20 Sep 2011 15:21:27 +0300
parents 43b3b761d9d1
children a819b5777727
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
12424
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
1 Test EOL update
11249
0bb67503ad4b eol: extension for managing file EOLs
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
2
13519
43b3b761d9d1 tests: don't overwrite HGRCPATH
Martin Geisler <mg@aragost.com>
parents: 12943
diff changeset
3 $ cat >> $HGRCPATH <<EOF
12424
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
4 > [diff]
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
5 > git = 1
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
6 > EOF
11249
0bb67503ad4b eol: extension for managing file EOLs
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
7
12424
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
8 $ seteol () {
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
9 > if [ $1 = "LF" ]; then
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
10 > EOL='\n'
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
11 > else
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
12 > EOL='\r\n'
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
13 > fi
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
14 > }
11249
0bb67503ad4b eol: extension for managing file EOLs
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
15
12424
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
16 $ makerepo () {
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
17 > echo
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
18 > echo "# ==== setup repository ===="
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
19 > echo '% hg init'
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
20 > hg init repo
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
21 > cd repo
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
22 >
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
23 > cat > .hgeol <<EOF
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
24 > [patterns]
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
25 > **.txt = LF
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
26 > EOF
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
27 >
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
28 > printf "first\nsecond\nthird\n" > a.txt
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
29 > hg commit --addremove -m 'LF commit'
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
30 >
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
31 > cat > .hgeol <<EOF
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
32 > [patterns]
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
33 > **.txt = CRLF
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
34 > EOF
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
35 >
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
36 > printf "first\r\nsecond\r\nthird\r\n" > a.txt
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
37 > hg commit -m 'CRLF commit'
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
38 >
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
39 > cd ..
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
40 > }
11249
0bb67503ad4b eol: extension for managing file EOLs
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
41
12424
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
42 $ dotest () {
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
43 > seteol $1
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
44 >
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
45 > echo
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
46 > echo "% hg clone repo repo-$1"
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
47 > hg clone --noupdate repo repo-$1
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
48 > cd repo-$1
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
49 >
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
50 > cat > .hg/hgrc <<EOF
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
51 > [extensions]
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
52 > eol =
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
53 > EOF
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
54 >
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
55 > hg update
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
56 >
12943
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
57 > echo '% a.txt (before)'
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
58 > cat a.txt
12424
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
59 >
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
60 > printf "first${EOL}third${EOL}" > a.txt
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
61 >
12943
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
62 > echo '% a.txt (after)'
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
63 > cat a.txt
12424
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
64 > echo '% hg diff'
12943
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
65 > hg diff
12424
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
66 >
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
67 > echo '% hg update 0'
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
68 > hg update 0
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
69 >
12943
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
70 > echo '% a.txt'
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
71 > cat a.txt
12424
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
72 > echo '% hg diff'
12943
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
73 > hg diff
12424
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
74 >
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
75 >
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
76 > cd ..
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
77 > rm -r repo-$1
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
78 > }
11249
0bb67503ad4b eol: extension for managing file EOLs
Martin Geisler <mg@lazybytes.net>
parents:
diff changeset
79
12424
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
80 $ makerepo
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
81
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
82 # ==== setup repository ====
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
83 % hg init
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
84 adding .hgeol
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
85 adding a.txt
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
86 $ dotest LF
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
87
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
88 % hg clone repo repo-LF
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
89 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
12943
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
90 % a.txt (before)
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
91 first\r (esc)
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
92 second\r (esc)
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
93 third\r (esc)
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
94 % a.txt (after)
12424
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
95 first
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
96 third
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
97 % hg diff
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
98 diff --git a/a.txt b/a.txt
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
99 --- a/a.txt
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
100 +++ b/a.txt
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
101 @@ -1,3 +1,2 @@
12943
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
102 first\r (esc)
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
103 -second\r (esc)
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
104 third\r (esc)
12424
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
105 % hg update 0
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
106 merging a.txt
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
107 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
12943
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
108 % a.txt
12424
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
109 first
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
110 third
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
111 % hg diff
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
112 diff --git a/a.txt b/a.txt
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
113 --- a/a.txt
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
114 +++ b/a.txt
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
115 @@ -1,3 +1,2 @@
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
116 first
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
117 -second
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
118 third
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
119 $ dotest CRLF
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
120
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
121 % hg clone repo repo-CRLF
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
122 2 files updated, 0 files merged, 0 files removed, 0 files unresolved
12943
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
123 % a.txt (before)
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
124 first\r (esc)
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
125 second\r (esc)
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
126 third\r (esc)
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
127 % a.txt (after)
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
128 first\r (esc)
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
129 third\r (esc)
12424
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
130 % hg diff
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
131 diff --git a/a.txt b/a.txt
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
132 --- a/a.txt
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
133 +++ b/a.txt
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
134 @@ -1,3 +1,2 @@
12943
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
135 first\r (esc)
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
136 -second\r (esc)
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
137 third\r (esc)
12424
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
138 % hg update 0
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
139 merging a.txt
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
140 1 files updated, 1 files merged, 0 files removed, 0 files unresolved
12943
7439ea4146f8 tests: use (esc) instead of other kinds of string escaping
Mads Kiilerich <mads@kiilerich.com>
parents: 12424
diff changeset
141 % a.txt
12424
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
142 first
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
143 third
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
144 % hg diff
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
145 diff --git a/a.txt b/a.txt
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
146 --- a/a.txt
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
147 +++ b/a.txt
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
148 @@ -1,3 +1,2 @@
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
149 first
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
150 -second
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
151 third
1aa7ba33f6a9 tests: unify test-eol-update
Matt Mackall <mpm@selenic.com>
parents: 11249
diff changeset
152 $ rm -r repo