upstream/mercurial-mirror Files · tests/test-copy-move-merge.out

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

Download file

             test-copy-move-merge.out
        
                    37 lines
            
             | 1.0 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-copy-move-merge.out

History | Source | Raw |Copy content |Copy permalink

Matt Mackall merge: avoid double deletion mentioned in issue636	r5059	1 files updated, 0 files merged, 2 files removed, 0 files unresolved
Matt Mackall merge: add debug diagnostics for findcopies	r5371	searching for copies back to rev 1
		unmatched files in other:
		b
		c
		all copies found (* = to merge, ! = divergent):
		c -> a *
		b -> a *
		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 583c7b748052 local fb3948d97f07+ remote 7f1309517659
Matt Mackall merge: avoid double deletion mentioned in issue636	r5059	a: remote moved to c -> m
		a: remote moved to b -> m
Matt Mackall merge: introduce mergestate	r6512	preserving a for resolve of b
		preserving a for resolve of c
		removing a
Augie Fackler update: make calls to ui.progress()	r10431	update: a 1/2 files (50.00%)
Matt Mackall merge: introduce mergestate	r6512	picked tool 'internal:merge' for b (binary False symlink False)
		merging a and b to b
Ronny Pfannschmidt filelog: sort meta entries, ensure deterministic order	r10490	my b@fb3948d97f07+ other b@7f1309517659 ancestor a@583c7b748052
Matt Mackall merge: allow smarter tool configuration...	r6004	premerge successful
Augie Fackler update: make calls to ui.progress()	r10431	update: a 2/2 files (100.00%)
Matt Mackall merge: introduce mergestate	r6512	picked tool 'internal:merge' for c (binary False symlink False)
		merging a and c to c
Ronny Pfannschmidt filelog: sort meta entries, ensure deterministic order	r10490	my c@fb3948d97f07+ other c@7f1309517659 ancestor a@583c7b748052
Matt Mackall merge: allow smarter tool configuration...	r6004	premerge successful
Matt Mackall merge: avoid double deletion mentioned in issue636	r5059	0 files updated, 2 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		-- b --
		0
		1
		2
		-- c --
		0
		1
		2

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages