upstream/mercurial-mirror Files · tests/test-issue672.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-issue672.out
        
                    62 lines
            
             | 2.1 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-issue672.out

History | Source | Raw |Copy content |Copy permalink

Alexis S. L. Carvalho merge: fix a copy detection bug (issue672)...	r5096	adding 1
		adding 2
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Matt Mackall merge: add debug diagnostics for findcopies	r5371	searching for copies back to rev 1
		unmatched files in other:
		1a
		all copies found (* = to merge, ! = divergent):
		1a -> 1
		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 81f4b099af3d local c64f439569a9+ remote c12dcd37c90a
Alexis S. L. Carvalho merge: fix a copy detection bug (issue672)...	r5096	1: other deleted -> r
		1a: remote created -> g
Augie Fackler update: make calls to ui.progress()	r10431	update: 1 1/2 files (50.00%)
Alexis S. L. Carvalho merge: fix a copy detection bug (issue672)...	r5096	removing 1
Augie Fackler update: make calls to ui.progress()	r10431	update: 1a 2/2 files (100.00%)
Alexis S. L. Carvalho merge: fix a copy detection bug (issue672)...	r5096	getting 1a
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Alexis S. L. Carvalho merge: fix a copy detection bug (issue672)...	r5096	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
Matt Mackall merge: add debug diagnostics for findcopies	r5371	searching for copies back to rev 1
		unmatched files in local:
		1a
		all copies found (* = to merge, ! = divergent):
		1a -> 1 *
		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 c64f439569a9 local e327dca35ac8+ remote 746e9549ea96
Matt Mackall merge: combine a copy and move case	r8748	1a: local copied/moved to 1 -> m
Matt Mackall merge: introduce mergestate	r6512	preserving 1a for resolve of 1a
Augie Fackler update: make calls to ui.progress()	r10431	update: 1a 1/1 files (100.00%)
Matt Mackall merge: allow smarter tool configuration...	r6004	picked tool 'internal:merge' for 1a (binary False symlink False)
Matt Mackall merge: introduce mergestate	r6512	merging 1a and 1 to 1a
Ronny Pfannschmidt filelog: sort meta entries, ensure deterministic order	r10490	my 1a@e327dca35ac8+ other 1@746e9549ea96 ancestor 1@81f4b099af3d
Matt Mackall merge: allow smarter tool configuration...	r6004	premerge successful
Alexis S. L. Carvalho merge: fix a copy detection bug (issue672)...	r5096	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		1 files updated, 0 files merged, 1 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:
		1a
		all copies found (* = to merge, ! = divergent):
		1a -> 1 *
		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 c64f439569a9 local 746e9549ea96+ remote e327dca35ac8
Alexis S. L. Carvalho merge: fix a copy detection bug (issue672)...	r5096	1: remote moved to 1a -> m
Matt Mackall merge: introduce mergestate	r6512	preserving 1 for resolve of 1a
		removing 1
Augie Fackler update: make calls to ui.progress()	r10431	update: 1 1/1 files (100.00%)
Matt Mackall merge: introduce mergestate	r6512	picked tool 'internal:merge' for 1a (binary False symlink False)
		merging 1 and 1a to 1a
Ronny Pfannschmidt filelog: sort meta entries, ensure deterministic order	r10490	my 1a@746e9549ea96+ other 1a@e327dca35ac8 ancestor 1@81f4b099af3d
Matt Mackall merge: allow smarter tool configuration...	r6004	premerge successful
Alexis S. L. Carvalho merge: fix a copy detection bug (issue672)...	r5096	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

	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