tests/test-eol-update.out
author Martin Geisler <mg@lazybytes.net>
Sun, 15 Aug 2010 17:49:59 +0200
branchstable
changeset 11885 08cd25ef8a38
parent 11249 0bb67503ad4b
child 12317 ed639917c825
permissions -rw-r--r--
dagparser: transplant part of 4e804302d30c


# ==== setup repository ====
% hg init
adding .hgeol
adding a.txt

% hg clone repo repo-LF
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
% printrepr.py a.txt (before)
first\r
second\r
third\r
% printrepr.py a.txt (after)
first
third
% hg diff
diff --git a/a.txt b/a.txt
--- a/a.txt
+++ b/a.txt
@@ -1,3 +1,2 @@
 first\r
-second\r
 third\r
% hg update 0
merging a.txt
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
% printrepr.py a.txt
first\r
third\r
% hg diff
diff --git a/a.txt b/a.txt
--- a/a.txt
+++ b/a.txt
@@ -1,3 +1,2 @@
 first
-second
 third

% hg clone repo repo-CRLF
2 files updated, 0 files merged, 0 files removed, 0 files unresolved
% printrepr.py a.txt (before)
first\r
second\r
third\r
% printrepr.py a.txt (after)
first\r
third\r
% hg diff
diff --git a/a.txt b/a.txt
--- a/a.txt
+++ b/a.txt
@@ -1,3 +1,2 @@
 first\r
-second\r
 third\r
% hg update 0
merging a.txt
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
% printrepr.py a.txt
first\r
third\r
% hg diff
diff --git a/a.txt b/a.txt
--- a/a.txt
+++ b/a.txt
@@ -1,3 +1,2 @@
 first
-second
 third