##// END OF EJS Templates
eol: don't fallback to use .hgeol from tip (BC)...
Mads Kiilerich -
r43478:4aa9f3a1 default
parent child Browse files
Show More
@@ -387,7 +387,7 b' def reposetup(ui, repo):'
387 387 return eol.match
388 388
389 389 def _hgcleardirstate(self):
390 self._eolmatch = self.loadeol([None, b'tip'])
390 self._eolmatch = self.loadeol([None])
391 391 if not self._eolmatch:
392 392 self._eolmatch = util.never
393 393 return
@@ -21,9 +21,8 b' setup repository'
21 21 adding .hgeol
22 22 adding a.txt
23 23
24 Test commit of removed .hgeol - currently it seems to live on as zombie
25 (causing "filtering a.txt through tolf") after being removed ... but actually
26 it is just confusing use of tip revision.
24 Test commit of removed .hgeol and how it immediately makes the automatic
25 changes explicit and committable.
27 26
28 27 $ cd ..
29 28 $ hg clone repo repo-2
@@ -41,7 +40,7 b' it is just confusing use of tip revision'
41 40 $ hg remove .hgeol
42 41 $ touch a.txt * # ensure consistent st dirtyness checks, ignoring dirstate timing
43 42 $ hg st -v --debug
44 filtering a.txt through tolf
43 M a.txt
45 44 R .hgeol
46 45 $ hg commit -m 'remove eol'
47 46 $ hg exp
@@ -49,16 +48,26 b' it is just confusing use of tip revision'
49 48 # User test
50 49 # Date 0 0
51 50 # Thu Jan 01 00:00:00 1970 +0000
52 # Node ID c60b96c20c7de8c821127b548c34e5b170bcf9fe
51 # Node ID 3c20c2d90333b6ecdc8f7aa8f9b73223c7c7a608
53 52 # Parent 90f94e2cf4e24628afddd641688dfe4cd476d6e4
54 53 remove eol
55 54
56 diff -r 90f94e2cf4e2 -r c60b96c20c7d .hgeol
55 diff -r 90f94e2cf4e2 -r 3c20c2d90333 .hgeol
57 56 --- a/.hgeol Thu Jan 01 00:00:00 1970 +0000
58 57 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000
59 58 @@ -1,2 +0,0 @@
60 59 -[patterns]
61 60 -**.txt = native
61 diff -r 90f94e2cf4e2 -r 3c20c2d90333 a.txt
62 --- a/a.txt Thu Jan 01 00:00:00 1970 +0000
63 +++ b/a.txt Thu Jan 01 00:00:00 1970 +0000
64 @@ -1,3 +1,3 @@
65 -first
66 -second
67 -third
68 +first\r (esc)
69 +second\r (esc)
70 +third\r (esc)
62 71 $ hg push --quiet
63 72 $ cd ..
64 73
@@ -75,7 +84,7 b' the source repo:'
75 84 updating to branch default
76 85 resolving manifests
77 86 branchmerge: False, force: False, partial: False
78 ancestor: 000000000000, local: 000000000000+, remote: c60b96c20c7d
87 ancestor: 000000000000, local: 000000000000+, remote: 3c20c2d90333
79 88 calling hook preupdate.eol: hgext.eol.preupdate
80 89 a.txt: remote created -> g
81 90 getting a.txt
@@ -83,9 +92,9 b' the source repo:'
83 92 $ cd repo-3
84 93
85 94 $ cat a.txt
86 first
87 second
88 third
95 first\r (esc)
96 second\r (esc)
97 third\r (esc)
89 98
90 99 Test clone of revision with .hgeol
91 100
General Comments 0
You need to be logged in to leave comments. Login now