Mercurial > hg
comparison tests/test-eol-add.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 repository ==== | |
3 % hg init | |
4 adding a.txt | |
5 | |
6 % hg clone repo repo-LF | |
7 updating to branch default | |
8 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
9 % hg add .hgeol | |
10 % hg status | |
11 A .hgeol | |
12 % hg commit | |
13 % hg status | |
14 % hg tip -p | |
15 changeset: 1:34614fc6dc02 | |
16 tag: tip | |
17 user: test | |
18 date: Thu Jan 01 00:03:20 1970 +0000 | |
19 summary: Added .hgeol file | |
20 | |
21 diff --git a/.hgeol b/.hgeol | |
22 new file mode 100644 | |
23 --- /dev/null | |
24 +++ b/.hgeol | |
25 @@ -0,0 +1,5 @@ | |
26 +[patterns] | |
27 +**.txt = native | |
28 + | |
29 +[repository] | |
30 +native = LF | |
31 | |
32 | |
33 % hg clone repo repo-CRLF | |
34 updating to branch default | |
35 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
36 % hg add .hgeol | |
37 % hg status | |
38 M a.txt | |
39 A .hgeol | |
40 % hg commit | |
41 % hg status | |
42 % hg tip -p | |
43 changeset: 1:4bbdacd3fe39 | |
44 tag: tip | |
45 user: test | |
46 date: Thu Jan 01 00:03:20 1970 +0000 | |
47 summary: Added .hgeol file | |
48 | |
49 diff --git a/.hgeol b/.hgeol | |
50 new file mode 100644 | |
51 --- /dev/null | |
52 +++ b/.hgeol | |
53 @@ -0,0 +1,5 @@ | |
54 +[patterns] | |
55 +**.txt = native | |
56 + | |
57 +[repository] | |
58 +native = CRLF | |
59 diff --git a/a.txt b/a.txt | |
60 --- a/a.txt | |
61 +++ b/a.txt | |
62 @@ -1,3 +1,3 @@ | |
63 -first | |
64 -second | |
65 -third | |
66 +first\r | |
67 +second\r | |
68 +third\r | |
69 |