equal
deleted
inserted
replaced
1 |
|
2 # ==== setup repository ==== |
|
3 % hg init |
|
4 adding .hgeol |
|
5 adding a.txt |
|
6 |
|
7 % hg clone repo repo-LF |
|
8 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
9 % printrepr.py a.txt (before) |
|
10 first\r |
|
11 second\r |
|
12 third\r |
|
13 % printrepr.py a.txt (after) |
|
14 first |
|
15 third |
|
16 % hg diff |
|
17 diff --git a/a.txt b/a.txt |
|
18 --- a/a.txt |
|
19 +++ b/a.txt |
|
20 @@ -1,3 +1,2 @@ |
|
21 first\r |
|
22 -second\r |
|
23 third\r |
|
24 % hg update 0 |
|
25 merging a.txt |
|
26 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
27 % printrepr.py a.txt |
|
28 first |
|
29 third |
|
30 % hg diff |
|
31 diff --git a/a.txt b/a.txt |
|
32 --- a/a.txt |
|
33 +++ b/a.txt |
|
34 @@ -1,3 +1,2 @@ |
|
35 first |
|
36 -second |
|
37 third |
|
38 |
|
39 % hg clone repo repo-CRLF |
|
40 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
41 % printrepr.py a.txt (before) |
|
42 first\r |
|
43 second\r |
|
44 third\r |
|
45 % printrepr.py a.txt (after) |
|
46 first\r |
|
47 third\r |
|
48 % hg diff |
|
49 diff --git a/a.txt b/a.txt |
|
50 --- a/a.txt |
|
51 +++ b/a.txt |
|
52 @@ -1,3 +1,2 @@ |
|
53 first\r |
|
54 -second\r |
|
55 third\r |
|
56 % hg update 0 |
|
57 merging a.txt |
|
58 1 files updated, 1 files merged, 0 files removed, 0 files unresolved |
|
59 % printrepr.py a.txt |
|
60 first |
|
61 third |
|
62 % hg diff |
|
63 diff --git a/a.txt b/a.txt |
|
64 --- a/a.txt |
|
65 +++ b/a.txt |
|
66 @@ -1,3 +1,2 @@ |
|
67 first |
|
68 -second |
|
69 third |
|