##// 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.
Ronny Pfannschmidt - - Load All Authors

File last commit:

r10490:f2618cac stable
r10521:bde1bb25 stable
Show More
test-double-merge.out
39 lines | 1.1 KiB | text/plain | TextLexer
/ tests / test-double-merge.out
History | Source | Raw |Copy content |Copy permalink
Dirkjan Ochtman
warn about new heads on commit (issue842)
 r6336 created new head
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
 r10490 changeset: 1:d9da848d0adf
Dirkjan Ochtman
merge: add -S/--show option to review revisions without merging
 r8387 user: test
date: Mon Jan 12 13:46:40 1970 +0000
summary: cp foo bar; change both
Matt Mackall
merge: add debug diagnostics for findcopies
 r5371 searching for copies back to rev 1
unmatched files in other:
bar
all copies found (* = to merge, ! = divergent):
bar -> foo *
checking for directory renames
Matt Mackall
merge: refactor manifestmerge init to better report effective ancestor
 r8753 resolving manifests
overwrite None partial False
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
 r10490 ancestor 310fd17130da local 2092631ce82b+ remote d9da848d0adf
Matt Mackall
merge: do early copy to deal with issue636...
 r5042 foo: versions differ -> m
foo: remote copied to bar -> m
Matt Mackall
merge: introduce mergestate
 r6512 preserving foo for resolve of bar
preserving foo for resolve of foo
Augie Fackler
update: make calls to ui.progress()
 r10431 update: foo 1/2 files (50.00%)
Matt Mackall
merge: introduce mergestate
 r6512 picked tool 'internal:merge' for bar (binary False symlink False)
merging foo and bar to bar
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
 r10490 my bar@2092631ce82b+ other bar@d9da848d0adf ancestor foo@310fd17130da
Matt Mackall
merge: allow smarter tool configuration...
 r6004 premerge successful
Augie Fackler
update: make calls to ui.progress()
 r10431 update: foo 2/2 files (100.00%)
Matt Mackall
merge: allow smarter tool configuration...
 r6004 picked tool 'internal:merge' for foo (binary False symlink False)
Matt Mackall
merge: do early copy to deal with issue636...
 r5042 merging foo
Ronny Pfannschmidt
filelog: sort meta entries, ensure deterministic order
 r10490 my foo@2092631ce82b+ other foo@d9da848d0adf ancestor foo@310fd17130da
Matt Mackall
merge: allow smarter tool configuration...
 r6004 premerge successful
Matt Mackall
merge: do early copy to deal with issue636...
 r5042 0 files updated, 2 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)
-- foo --
line 0
line 1
line 2-1
-- bar --
line 0
line 1
line 2-2