Mercurial > hg
comparison tests/test-eol-patch.out @ 11249:0bb67503ad4b stable
eol: extension for managing file EOLs
author | Martin Geisler <mg@lazybytes.net> |
---|---|
date | Mon, 31 May 2010 21:37:01 +0200 |
parents | |
children |
comparison
equal
deleted
inserted
replaced
11246:8f5ad12db28e | 11249:0bb67503ad4b |
---|---|
1 | |
2 # ==== setup LF repository ==== | |
3 % hg init | |
4 adding .hgeol | |
5 adding native.txt | |
6 adding unix.txt | |
7 adding win.txt | |
8 | |
9 % hg clone repo repo-LF | |
10 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
11 % printrepr.py native.txt | |
12 first | |
13 second | |
14 third | |
15 % printrepr.py unix.txt | |
16 first | |
17 second | |
18 third | |
19 % printrepr.py win.txt | |
20 first\r | |
21 second\r | |
22 third\r | |
23 % hg diff | |
24 diff --git a/native.txt b/native.txt | |
25 --- a/native.txt | |
26 +++ b/native.txt | |
27 @@ -1,3 +1,2 @@ | |
28 first | |
29 -second | |
30 third | |
31 diff --git a/unix.txt b/unix.txt | |
32 --- a/unix.txt | |
33 +++ b/unix.txt | |
34 @@ -1,3 +1,2 @@ | |
35 first | |
36 -second | |
37 third | |
38 diff --git a/win.txt b/win.txt | |
39 --- a/win.txt | |
40 +++ b/win.txt | |
41 @@ -1,3 +1,2 @@ | |
42 first\r | |
43 -second\r | |
44 third\r | |
45 % hg revert | |
46 reverting native.txt | |
47 reverting unix.txt | |
48 reverting win.txt | |
49 % hg import | |
50 applying p | |
51 % printrepr.py native.txt | |
52 first | |
53 third | |
54 % printrepr.py unix.txt | |
55 first | |
56 third | |
57 % printrepr.py win.txt | |
58 first\r | |
59 third\r | |
60 % hg diff -c tip | |
61 diff --git a/native.txt b/native.txt | |
62 --- a/native.txt | |
63 +++ b/native.txt | |
64 @@ -1,3 +1,2 @@ | |
65 first | |
66 -second | |
67 third | |
68 diff --git a/unix.txt b/unix.txt | |
69 --- a/unix.txt | |
70 +++ b/unix.txt | |
71 @@ -1,3 +1,2 @@ | |
72 first | |
73 -second | |
74 third | |
75 diff --git a/win.txt b/win.txt | |
76 --- a/win.txt | |
77 +++ b/win.txt | |
78 @@ -1,3 +1,2 @@ | |
79 first\r | |
80 -second\r | |
81 third\r | |
82 | |
83 % hg clone repo repo-CRLF | |
84 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
85 % printrepr.py native.txt | |
86 first\r | |
87 second\r | |
88 third\r | |
89 % printrepr.py unix.txt | |
90 first | |
91 second | |
92 third | |
93 % printrepr.py win.txt | |
94 first\r | |
95 second\r | |
96 third\r | |
97 % hg diff | |
98 diff --git a/native.txt b/native.txt | |
99 --- a/native.txt | |
100 +++ b/native.txt | |
101 @@ -1,3 +1,2 @@ | |
102 first | |
103 -second | |
104 third | |
105 diff --git a/unix.txt b/unix.txt | |
106 --- a/unix.txt | |
107 +++ b/unix.txt | |
108 @@ -1,3 +1,2 @@ | |
109 first | |
110 -second | |
111 third | |
112 diff --git a/win.txt b/win.txt | |
113 --- a/win.txt | |
114 +++ b/win.txt | |
115 @@ -1,3 +1,2 @@ | |
116 first\r | |
117 -second\r | |
118 third\r | |
119 % hg revert | |
120 reverting native.txt | |
121 reverting unix.txt | |
122 reverting win.txt | |
123 % hg import | |
124 applying p | |
125 % printrepr.py native.txt | |
126 first\r | |
127 third\r | |
128 % printrepr.py unix.txt | |
129 first | |
130 third | |
131 % printrepr.py win.txt | |
132 first\r | |
133 third\r | |
134 % hg diff -c tip | |
135 diff --git a/native.txt b/native.txt | |
136 --- a/native.txt | |
137 +++ b/native.txt | |
138 @@ -1,3 +1,2 @@ | |
139 first | |
140 -second | |
141 third | |
142 diff --git a/unix.txt b/unix.txt | |
143 --- a/unix.txt | |
144 +++ b/unix.txt | |
145 @@ -1,3 +1,2 @@ | |
146 first | |
147 -second | |
148 third | |
149 diff --git a/win.txt b/win.txt | |
150 --- a/win.txt | |
151 +++ b/win.txt | |
152 @@ -1,3 +1,2 @@ | |
153 first\r | |
154 -second\r | |
155 third\r | |
156 | |
157 # ==== setup CRLF repository ==== | |
158 % hg init | |
159 adding .hgeol | |
160 adding native.txt | |
161 adding unix.txt | |
162 adding win.txt | |
163 | |
164 % hg clone repo repo-LF | |
165 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
166 % printrepr.py native.txt | |
167 first | |
168 second | |
169 third | |
170 % printrepr.py unix.txt | |
171 first | |
172 second | |
173 third | |
174 % printrepr.py win.txt | |
175 first\r | |
176 second\r | |
177 third\r | |
178 % hg diff | |
179 diff --git a/native.txt b/native.txt | |
180 --- a/native.txt | |
181 +++ b/native.txt | |
182 @@ -1,3 +1,2 @@ | |
183 first\r | |
184 -second\r | |
185 third\r | |
186 diff --git a/unix.txt b/unix.txt | |
187 --- a/unix.txt | |
188 +++ b/unix.txt | |
189 @@ -1,3 +1,2 @@ | |
190 first | |
191 -second | |
192 third | |
193 diff --git a/win.txt b/win.txt | |
194 --- a/win.txt | |
195 +++ b/win.txt | |
196 @@ -1,3 +1,2 @@ | |
197 first\r | |
198 -second\r | |
199 third\r | |
200 % hg revert | |
201 reverting native.txt | |
202 reverting unix.txt | |
203 reverting win.txt | |
204 % hg import | |
205 applying p | |
206 % printrepr.py native.txt | |
207 first | |
208 third | |
209 % printrepr.py unix.txt | |
210 first | |
211 third | |
212 % printrepr.py win.txt | |
213 first\r | |
214 third\r | |
215 % hg diff -c tip | |
216 diff --git a/native.txt b/native.txt | |
217 --- a/native.txt | |
218 +++ b/native.txt | |
219 @@ -1,3 +1,2 @@ | |
220 first\r | |
221 -second\r | |
222 third\r | |
223 diff --git a/unix.txt b/unix.txt | |
224 --- a/unix.txt | |
225 +++ b/unix.txt | |
226 @@ -1,3 +1,2 @@ | |
227 first | |
228 -second | |
229 third | |
230 diff --git a/win.txt b/win.txt | |
231 --- a/win.txt | |
232 +++ b/win.txt | |
233 @@ -1,3 +1,2 @@ | |
234 first\r | |
235 -second\r | |
236 third\r | |
237 | |
238 % hg clone repo repo-CRLF | |
239 4 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
240 % printrepr.py native.txt | |
241 first\r | |
242 second\r | |
243 third\r | |
244 % printrepr.py unix.txt | |
245 first | |
246 second | |
247 third | |
248 % printrepr.py win.txt | |
249 first\r | |
250 second\r | |
251 third\r | |
252 % hg diff | |
253 diff --git a/native.txt b/native.txt | |
254 --- a/native.txt | |
255 +++ b/native.txt | |
256 @@ -1,3 +1,2 @@ | |
257 first\r | |
258 -second\r | |
259 third\r | |
260 diff --git a/unix.txt b/unix.txt | |
261 --- a/unix.txt | |
262 +++ b/unix.txt | |
263 @@ -1,3 +1,2 @@ | |
264 first | |
265 -second | |
266 third | |
267 diff --git a/win.txt b/win.txt | |
268 --- a/win.txt | |
269 +++ b/win.txt | |
270 @@ -1,3 +1,2 @@ | |
271 first\r | |
272 -second\r | |
273 third\r | |
274 % hg revert | |
275 reverting native.txt | |
276 reverting unix.txt | |
277 reverting win.txt | |
278 % hg import | |
279 applying p | |
280 % printrepr.py native.txt | |
281 first\r | |
282 third\r | |
283 % printrepr.py unix.txt | |
284 first | |
285 third | |
286 % printrepr.py win.txt | |
287 first\r | |
288 third\r | |
289 % hg diff -c tip | |
290 diff --git a/native.txt b/native.txt | |
291 --- a/native.txt | |
292 +++ b/native.txt | |
293 @@ -1,3 +1,2 @@ | |
294 first\r | |
295 -second\r | |
296 third\r | |
297 diff --git a/unix.txt b/unix.txt | |
298 --- a/unix.txt | |
299 +++ b/unix.txt | |
300 @@ -1,3 +1,2 @@ | |
301 first | |
302 -second | |
303 third | |
304 diff --git a/win.txt b/win.txt | |
305 --- a/win.txt | |
306 +++ b/win.txt | |
307 @@ -1,3 +1,2 @@ | |
308 first\r | |
309 -second\r | |
310 third\r |