##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

Do not use osutil.c with python 2.4 and Windows (issue1364)...
Do not use osutil.c with python 2.4 and Windows (issue1364) Windows python 2.4 os.stat() reports times including DST offset, while osutil.c reports the correct value, which makes status() systematically compare files content. This bug is fixed in python 2.5. Using osutil.py instead of osutil.c is 4x times slower on large repositories but current code is completely unusable. Given few people are likely to use python 2.4 on Windows this solution was considered a good trade-off compared to more invasive solutions trying to address the offset issue.
Augie Fackler - - Load All Authors

File last commit:

r10431:ba5e508b default
r10521:bde1bb25 stable
Show More
test-merge-types.out
29 lines | 1.1 KiB | text/plain | TextLexer
/ tests / test-merge-types.out
History | Source | Raw |Copy content |Copy permalink
Matt Mackall
update test-merge-types
 r5710 adding a
0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Matt Mackall
merge: refactor manifestmerge init to better report effective ancestor
 r8753 searching for copies back to rev 1
Matt Mackall
update test-merge-types
 r5710 resolving manifests
overwrite None partial False
ancestor c334dc3be0da local 521a1e40188f+ remote 3574f3e69b1c
Peter Arrenbrecht
ui: log non-interactive default response to stdout when verbose...
 r7320 conflicting flags for a
(n)one, e(x)ec or sym(l)ink? n
Matt Mackall
update test-merge-types
 r5710 a: update permissions -> e
Augie Fackler
update: make calls to ui.progress()
 r10431 update: a 1/1 files (100.00%)
Matt Mackall
update test-merge-types
 r5710 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% symlink is local parent, executable is other
a has no flags (default for conflicts)
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall
merge: refactor manifestmerge init to better report effective ancestor
 r8753 searching for copies back to rev 1
Matt Mackall
update test-merge-types
 r5710 resolving manifests
overwrite None partial False
ancestor c334dc3be0da local 3574f3e69b1c+ remote 521a1e40188f
Peter Arrenbrecht
ui: log non-interactive default response to stdout when verbose...
 r7320 conflicting flags for a
(n)one, e(x)ec or sym(l)ink? n
Matt Mackall
update test-merge-types
 r5710 a: remote is newer -> g
Augie Fackler
update: make calls to ui.progress()
 r10431 update: a 1/1 files (100.00%)
Matt Mackall
update test-merge-types
 r5710 getting a
1 files updated, 0 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
% symlink is other parent, executable is local
a has no flags (default for conflicts)