Mercurial > hg
diff 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 |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/tests/test-eol-patch.out Mon May 31 21:37:01 2010 +0200 @@ -0,0 +1,310 @@ + +# ==== setup LF repository ==== +% hg init +adding .hgeol +adding native.txt +adding unix.txt +adding win.txt + +% hg clone repo repo-LF +4 files updated, 0 files merged, 0 files removed, 0 files unresolved +% printrepr.py native.txt +first +second +third +% printrepr.py unix.txt +first +second +third +% printrepr.py win.txt +first\r +second\r +third\r +% hg diff +diff --git a/native.txt b/native.txt +--- a/native.txt ++++ b/native.txt +@@ -1,3 +1,2 @@ + first +-second + third +diff --git a/unix.txt b/unix.txt +--- a/unix.txt ++++ b/unix.txt +@@ -1,3 +1,2 @@ + first +-second + third +diff --git a/win.txt b/win.txt +--- a/win.txt ++++ b/win.txt +@@ -1,3 +1,2 @@ + first\r +-second\r + third\r +% hg revert +reverting native.txt +reverting unix.txt +reverting win.txt +% hg import +applying p +% printrepr.py native.txt +first +third +% printrepr.py unix.txt +first +third +% printrepr.py win.txt +first\r +third\r +% hg diff -c tip +diff --git a/native.txt b/native.txt +--- a/native.txt ++++ b/native.txt +@@ -1,3 +1,2 @@ + first +-second + third +diff --git a/unix.txt b/unix.txt +--- a/unix.txt ++++ b/unix.txt +@@ -1,3 +1,2 @@ + first +-second + third +diff --git a/win.txt b/win.txt +--- a/win.txt ++++ b/win.txt +@@ -1,3 +1,2 @@ + first\r +-second\r + third\r + +% hg clone repo repo-CRLF +4 files updated, 0 files merged, 0 files removed, 0 files unresolved +% printrepr.py native.txt +first\r +second\r +third\r +% printrepr.py unix.txt +first +second +third +% printrepr.py win.txt +first\r +second\r +third\r +% hg diff +diff --git a/native.txt b/native.txt +--- a/native.txt ++++ b/native.txt +@@ -1,3 +1,2 @@ + first +-second + third +diff --git a/unix.txt b/unix.txt +--- a/unix.txt ++++ b/unix.txt +@@ -1,3 +1,2 @@ + first +-second + third +diff --git a/win.txt b/win.txt +--- a/win.txt ++++ b/win.txt +@@ -1,3 +1,2 @@ + first\r +-second\r + third\r +% hg revert +reverting native.txt +reverting unix.txt +reverting win.txt +% hg import +applying p +% printrepr.py native.txt +first\r +third\r +% printrepr.py unix.txt +first +third +% printrepr.py win.txt +first\r +third\r +% hg diff -c tip +diff --git a/native.txt b/native.txt +--- a/native.txt ++++ b/native.txt +@@ -1,3 +1,2 @@ + first +-second + third +diff --git a/unix.txt b/unix.txt +--- a/unix.txt ++++ b/unix.txt +@@ -1,3 +1,2 @@ + first +-second + third +diff --git a/win.txt b/win.txt +--- a/win.txt ++++ b/win.txt +@@ -1,3 +1,2 @@ + first\r +-second\r + third\r + +# ==== setup CRLF repository ==== +% hg init +adding .hgeol +adding native.txt +adding unix.txt +adding win.txt + +% hg clone repo repo-LF +4 files updated, 0 files merged, 0 files removed, 0 files unresolved +% printrepr.py native.txt +first +second +third +% printrepr.py unix.txt +first +second +third +% printrepr.py win.txt +first\r +second\r +third\r +% hg diff +diff --git a/native.txt b/native.txt +--- a/native.txt ++++ b/native.txt +@@ -1,3 +1,2 @@ + first\r +-second\r + third\r +diff --git a/unix.txt b/unix.txt +--- a/unix.txt ++++ b/unix.txt +@@ -1,3 +1,2 @@ + first +-second + third +diff --git a/win.txt b/win.txt +--- a/win.txt ++++ b/win.txt +@@ -1,3 +1,2 @@ + first\r +-second\r + third\r +% hg revert +reverting native.txt +reverting unix.txt +reverting win.txt +% hg import +applying p +% printrepr.py native.txt +first +third +% printrepr.py unix.txt +first +third +% printrepr.py win.txt +first\r +third\r +% hg diff -c tip +diff --git a/native.txt b/native.txt +--- a/native.txt ++++ b/native.txt +@@ -1,3 +1,2 @@ + first\r +-second\r + third\r +diff --git a/unix.txt b/unix.txt +--- a/unix.txt ++++ b/unix.txt +@@ -1,3 +1,2 @@ + first +-second + third +diff --git a/win.txt b/win.txt +--- a/win.txt ++++ b/win.txt +@@ -1,3 +1,2 @@ + first\r +-second\r + third\r + +% hg clone repo repo-CRLF +4 files updated, 0 files merged, 0 files removed, 0 files unresolved +% printrepr.py native.txt +first\r +second\r +third\r +% printrepr.py unix.txt +first +second +third +% printrepr.py win.txt +first\r +second\r +third\r +% hg diff +diff --git a/native.txt b/native.txt +--- a/native.txt ++++ b/native.txt +@@ -1,3 +1,2 @@ + first\r +-second\r + third\r +diff --git a/unix.txt b/unix.txt +--- a/unix.txt ++++ b/unix.txt +@@ -1,3 +1,2 @@ + first +-second + third +diff --git a/win.txt b/win.txt +--- a/win.txt ++++ b/win.txt +@@ -1,3 +1,2 @@ + first\r +-second\r + third\r +% hg revert +reverting native.txt +reverting unix.txt +reverting win.txt +% hg import +applying p +% printrepr.py native.txt +first\r +third\r +% printrepr.py unix.txt +first +third +% printrepr.py win.txt +first\r +third\r +% hg diff -c tip +diff --git a/native.txt b/native.txt +--- a/native.txt ++++ b/native.txt +@@ -1,3 +1,2 @@ + first\r +-second\r + third\r +diff --git a/unix.txt b/unix.txt +--- a/unix.txt ++++ b/unix.txt +@@ -1,3 +1,2 @@ + first +-second + third +diff --git a/win.txt b/win.txt +--- a/win.txt ++++ b/win.txt +@@ -1,3 +1,2 @@ + first\r +-second\r + third\r