facebook/sapling
1
1
Fork 0
mirror of https://github.com/facebook/sapling.git synced 2024-10-07 15:27:13 +03:00
Code Issues Projects Releases Wiki Activity

test-eol-update: record new results as correct

Browse Source 
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.
This commit is contained in:
Steve Borho 2010-09-17 12:44:35 -05:00
parent 44786dde5f
commit 3e9e61ae68
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/test-eol-update.out
View File

@ -25,8 +25,8 @@ diff --git a/a.txt b/a.txt
merging a.txt
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
% printrepr.py a.txt
first\r
third\r
first
third
% hg diff
diff --git a/a.txt b/a.txt
--- a/a.txt
@ -57,8 +57,8 @@ diff --git a/a.txt b/a.txt
merging a.txt
1 files updated, 1 files merged, 0 files removed, 0 files unresolved
% printrepr.py a.txt
first\r
third\r
first
third
% hg diff
diff --git a/a.txt b/a.txt
--- a/a.txt