mirror of
https://github.com/facebook/sapling.git
synced 2024-10-08 07:49:11 +03:00
3e9e61ae68
Changeset 63043d17c14b changed the result of this test. The 'hg update 0' command, which causes a merge of modified a.txt, now leaves a.txt in the EOLN format specified by .hgeol as it was committed in revision 0. Previously, it used the .hgeol contents from the working directory before the update.
70 lines
1.1 KiB
Plaintext
70 lines
1.1 KiB
Plaintext
|
|
# ==== 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
|
|
third
|
|
% 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
|
|
third
|
|
% hg diff
|
|
diff --git a/a.txt b/a.txt
|
|
--- a/a.txt
|
|
+++ b/a.txt
|
|
@@ -1,3 +1,2 @@
|
|
first
|
|
-second
|
|
third
|