equal
deleted
inserted
replaced
248 $ touch .hgeol * |
248 $ touch .hgeol * |
249 $ hg st --debug |
249 $ hg st --debug |
250 eol: detected change in .hgeol |
250 eol: detected change in .hgeol |
251 filtering .hgeol through isbinary |
251 filtering .hgeol through isbinary |
252 filtering a.txt through tolf |
252 filtering a.txt through tolf |
|
253 skip updating dirstate: identity mismatch (?) |
253 $ hg diff |
254 $ hg diff |
254 |
255 |
255 Things were clean, and updating again will not change anything: |
256 Things were clean, and updating again will not change anything: |
256 |
257 |
257 $ touch .hgeol * |
258 $ touch .hgeol * |
261 filtering a.txt through tolf |
262 filtering a.txt through tolf |
262 resolving manifests |
263 resolving manifests |
263 branchmerge: False, force: True, partial: False |
264 branchmerge: False, force: True, partial: False |
264 ancestor: 15cbdf8ca3db+, local: 15cbdf8ca3db+, remote: 15cbdf8ca3db |
265 ancestor: 15cbdf8ca3db+, local: 15cbdf8ca3db+, remote: 15cbdf8ca3db |
265 calling hook preupdate.eol: hgext.eol.preupdate |
266 calling hook preupdate.eol: hgext.eol.preupdate |
|
267 starting 4 threads for background file closing (?) |
266 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
268 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
267 |
269 |
268 $ touch .hgeol * |
270 $ touch .hgeol * |
269 $ hg st --debug |
271 $ hg st --debug |
270 eol: detected change in .hgeol |
272 eol: detected change in .hgeol |