equal
deleted
inserted
replaced
185 branchmerge: False, force: False, partial: False |
185 branchmerge: False, force: False, partial: False |
186 ancestor: 000000000000, local: 000000000000+, remote: 15cbdf8ca3db |
186 ancestor: 000000000000, local: 000000000000+, remote: 15cbdf8ca3db |
187 calling hook preupdate.eol: hgext.eol.preupdate |
187 calling hook preupdate.eol: hgext.eol.preupdate |
188 .hgeol: remote created -> g |
188 .hgeol: remote created -> g |
189 getting .hgeol |
189 getting .hgeol |
190 filtering .hgeol through compat-isbinary |
190 filtering .hgeol through isbinary |
191 a.txt: remote created -> g |
191 a.txt: remote created -> g |
192 getting a.txt |
192 getting a.txt |
193 filtering a.txt through tolf |
193 filtering a.txt through tolf |
194 f: remote created -> g |
194 f: remote created -> g |
195 getting f |
195 getting f |
198 $ hg st |
198 $ hg st |
199 M f |
199 M f |
200 $ touch .hgeol * # ensure consistent dirtyness checks ignoring dirstate |
200 $ touch .hgeol * # ensure consistent dirtyness checks ignoring dirstate |
201 $ hg up -C -r 0 -v --debug |
201 $ hg up -C -r 0 -v --debug |
202 eol: detected change in .hgeol |
202 eol: detected change in .hgeol |
203 filtering .hgeol through compat-isbinary |
203 filtering .hgeol through isbinary |
204 filtering a.txt through tolf |
204 filtering a.txt through tolf |
205 resolving manifests |
205 resolving manifests |
206 branchmerge: False, force: True, partial: False |
206 branchmerge: False, force: True, partial: False |
207 ancestor: 15cbdf8ca3db+, local: 15cbdf8ca3db+, remote: 15cbdf8ca3db |
207 ancestor: 15cbdf8ca3db+, local: 15cbdf8ca3db+, remote: 15cbdf8ca3db |
208 calling hook preupdate.eol: hgext.eol.preupdate |
208 calling hook preupdate.eol: hgext.eol.preupdate |
261 branchmerge: False, force: True, partial: False |
261 branchmerge: False, force: True, partial: False |
262 ancestor: 1db78bdd3bd6+, local: 1db78bdd3bd6+, remote: 15cbdf8ca3db |
262 ancestor: 1db78bdd3bd6+, local: 1db78bdd3bd6+, remote: 15cbdf8ca3db |
263 calling hook preupdate.eol: hgext.eol.preupdate |
263 calling hook preupdate.eol: hgext.eol.preupdate |
264 .hgeol: remote is newer -> g |
264 .hgeol: remote is newer -> g |
265 getting .hgeol |
265 getting .hgeol |
266 filtering .hgeol through compat-isbinary |
266 filtering .hgeol through isbinary |
267 a.txt: remote is newer -> g |
267 a.txt: remote is newer -> g |
268 getting a.txt |
268 getting a.txt |
269 filtering a.txt through tolf |
269 filtering a.txt through tolf |
270 f: remote is newer -> g |
270 f: remote is newer -> g |
271 getting f |
271 getting f |
273 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
273 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
274 |
274 |
275 $ touch .hgeol * |
275 $ touch .hgeol * |
276 $ hg st --debug |
276 $ hg st --debug |
277 eol: detected change in .hgeol |
277 eol: detected change in .hgeol |
278 filtering .hgeol through compat-isbinary |
278 filtering .hgeol through isbinary |
279 filtering a.txt through tolf |
279 filtering a.txt through tolf |
280 M f |
280 M f |
281 $ hg diff |
281 $ hg diff |
282 diff --git a/f b/f |
282 diff --git a/f b/f |
283 --- a/f |
283 --- a/f |
289 Workaround: Update again - this will read the right .hgeol: |
289 Workaround: Update again - this will read the right .hgeol: |
290 |
290 |
291 $ touch .hgeol * |
291 $ touch .hgeol * |
292 $ hg up -C -r 0 -v --debug |
292 $ hg up -C -r 0 -v --debug |
293 eol: detected change in .hgeol |
293 eol: detected change in .hgeol |
294 filtering .hgeol through compat-isbinary |
294 filtering .hgeol through isbinary |
295 filtering a.txt through tolf |
295 filtering a.txt through tolf |
296 resolving manifests |
296 resolving manifests |
297 branchmerge: False, force: True, partial: False |
297 branchmerge: False, force: True, partial: False |
298 ancestor: 15cbdf8ca3db+, local: 15cbdf8ca3db+, remote: 15cbdf8ca3db |
298 ancestor: 15cbdf8ca3db+, local: 15cbdf8ca3db+, remote: 15cbdf8ca3db |
299 calling hook preupdate.eol: hgext.eol.preupdate |
299 calling hook preupdate.eol: hgext.eol.preupdate |
302 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
302 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
303 |
303 |
304 $ touch .hgeol * |
304 $ touch .hgeol * |
305 $ hg st --debug |
305 $ hg st --debug |
306 eol: detected change in .hgeol |
306 eol: detected change in .hgeol |
307 filtering .hgeol through compat-isbinary |
307 filtering .hgeol through isbinary |
308 filtering a.txt through tolf |
308 filtering a.txt through tolf |
309 |
309 |
310 $ cd .. |
310 $ cd .. |
311 |
311 |
312 $ rm -r repo |
312 $ rm -r repo |