upstream/mercurial-mirror Files · tests/test-rename-dir-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-rename-dir-merge.out
        
                    82 lines
            
             | 2.0 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-rename-dir-merge.out

History | Source | Raw |Copy content |Copy permalink

Matt Mackall Add missing test output	r3735	adding a/a
		adding a/b
		0 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall copy: handle rename internally...	r5610	moving a/a to b/a
		moving a/b to b/b
Matt Mackall Add missing test output	r3735	2 files updated, 0 files merged, 2 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 local:
		a/c
Matt Mackall rename: add test for moving untracked files in directories	r5567	a/d
Matt Mackall merge: add debug diagnostics for findcopies	r5371	unmatched files in other:
		b/a
		b/b
		all copies found (* = to merge, ! = divergent):
		b/a -> a/a
		b/b -> a/b
		checking for directory renames
		dir a/ -> b/
		file a/c -> b/c
Matt Mackall rename: add test for moving untracked files in directories	r5567	file a/d -> b/d
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 f9b20c0d4c51 local ce36d17b18fb+ remote 397f8b00a740
Matt Mackall rename: add test for moving untracked files in directories	r5567	a/d: remote renamed directory to b/d -> d
Matt Mackall Add missing test output	r3735	a/c: remote renamed directory to b/c -> d
Matt Mackall merge: fix spurious merges for copies in linear updates...	r4416	a/b: other deleted -> r
		a/a: other deleted -> r
		b/a: remote created -> g
		b/b: remote created -> g
Augie Fackler update: make calls to ui.progress()	r10431	update: a/a 1/6 files (16.67%)
Matt Mackall Add missing test output	r3735	removing a/a
Augie Fackler update: make calls to ui.progress()	r10431	update: a/b 2/6 files (33.33%)
Matt Mackall Add missing test output	r3735	removing a/b
Augie Fackler update: make calls to ui.progress()	r10431	update: a/c 3/6 files (50.00%)
Matt Mackall Add missing test output	r3735	moving a/c to b/c
Augie Fackler update: make calls to ui.progress()	r10431	update: a/d 4/6 files (66.67%)
Matt Mackall rename: add test for moving untracked files in directories	r5567	moving a/d to b/d
Augie Fackler update: make calls to ui.progress()	r10431	update: b/a 5/6 files (83.33%)
Matt Mackall merge: fix spurious merges for copies in linear updates...	r4416	getting b/a
Augie Fackler update: make calls to ui.progress()	r10431	update: b/b 6/6 files (100.00%)
Matt Mackall merge: fix spurious merges for copies in linear updates...	r4416	getting b/b
Matt Mackall rename: add test for moving untracked files in directories	r5567	4 files updated, 0 files merged, 2 files removed, 0 files unresolved
Matt Mackall Add missing test output	r3735	(branch merge, don't forget to commit)
Matt Mackall rename: add test for moving untracked files in directories	r5567	a/* b/a b/b b/c b/d
Matt Mackall Add missing test output	r3735	M b/a
		M b/b
		A b/c
		a/c
		R a/a
		R a/b
		R a/c
Matt Mackall rename: add test for moving untracked files in directories	r5567	? b/d
Alexis S. L. Carvalho correctly record file-level history when the local side renames a directory	r5229	b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88
Matt Mackall merge: fix spurious merges for copies in linear updates...	r4416	0 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:
		b/a
		b/b
Matt Mackall rename: add test for moving untracked files in directories	r5567	b/d
Matt Mackall merge: add debug diagnostics for findcopies	r5371	unmatched files in other:
		a/c
		all copies found (* = to merge, ! = divergent):
		b/a -> a/a
		b/b -> a/b
		checking for directory renames
		dir a/ -> b/
		file a/c -> b/c
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 f9b20c0d4c51 local 397f8b00a740+ remote ce36d17b18fb
Matt Mackall Add missing test output	r3735	None: local renamed directory to b/c -> d
Augie Fackler update: make calls to ui.progress()	r10431	update:None 1/1 files (100.00%)
Matt Mackall Add missing test output	r3735	getting a/c to b/c
Matt Mackall merge: fix spurious merges for copies in linear updates...	r4416	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall Add missing test output	r3735	(branch merge, don't forget to commit)
Matt Mackall rename: add test for moving untracked files in directories	r5567	a/* b/a b/b b/c b/d
Matt Mackall Add missing test output	r3735	A b/c
		a/c
Matt Mackall rename: add test for moving untracked files in directories	r5567	? b/d
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Alexis S. L. Carvalho correctly record file-level history when the local side renames a directory	r5229	b/c renamed from a/c:354ae8da6e890359ef49ade27b68bbc361f3ca88

	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