upstream/mercurial-mirror Files · tests/test-merge7.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.

Augie Fackler - - Load All Authors

File last commit:

r10431:ba5e508b default


                r10521:bde1bb25

stable

Download file

             test-merge7.out
        
                    78 lines
            
             | 2.6 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge7.out

History | Source | Raw |Copy content |Copy permalink

Adrian Buehlmann hg.clone: report branch name on update	r9611	updating to branch default
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall Make test-merge7 repeatable	r1352	pulling from ../test-a
Matt Mackall Repair ancestor logic, fix up test cases	r1351	searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files (+1 heads)
Vadim Gelfer add merge command. means same thing as "update -m"....	r2019	(run 'hg heads' to see heads, 'hg merge' to merge)
Matt Mackall merge: allow smarter tool configuration...	r6004	merging test.txt
Alexis S. L. Carvalho change tests to use simplemerge by default	r4365	warning: conflicts during merge.
Matt Mackall Repair ancestor logic, fix up test cases	r1351	merging test.txt failed!
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
Stuart W Marks hg: say 'hg update' instead of 'hg up' in merge status message...	r9468	use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
Matt Mackall Make test-merge7 repeatable	r1352	pulling from ../test-a
Matt Mackall Repair ancestor logic, fix up test cases	r1351	searching for changes
		adding changesets
		adding manifests
		adding file changes
		added 1 changesets with 1 changes to 1 files (+1 heads)
Vadim Gelfer add merge command. means same thing as "update -m"....	r2019	(run 'hg heads' to see heads, 'hg merge' to merge)
Matt Mackall merge: refactor manifestmerge init to better report effective ancestor	r8753	searching for copies back to rev 1
Matt Mackall Repair ancestor logic, fix up test cases	r1351	resolving manifests
Matt Mackall merge: various tidying...	r3314	overwrite None partial False
		ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360
Matt Mackall merge: simplify actions with helper function	r3121	test.txt: versions differ -> m
Matt Mackall merge: introduce mergestate	r6512	preserving test.txt for resolve of test.txt
Augie Fackler update: make calls to ui.progress()	r10431	update: test.txt 1/1 files (100.00%)
Matt Mackall merge: allow smarter tool configuration...	r6004	picked tool 'internal:merge' for test.txt (binary False symlink False)
Matt Mackall Repair ancestor logic, fix up test cases	r1351	merging test.txt
Matt Mackall merge: various tidying...	r3314	my test.txt@451c744aabcc+ other test.txt@a070d41e8360 ancestor test.txt@faaea63e63a9
Matt Mackall merge: allow smarter tool configuration...	r6004	warning: conflicts during merge.
Matt Mackall Repair ancestor logic, fix up test cases	r1351	merging test.txt failed!
Benoit Boissinot ui: output the number of file updated/merged/removed/... on update...	r1922	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
Stuart W Marks hg: say 'hg update' instead of 'hg up' in merge status message...	r9468	use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon
Matt Mackall Repair ancestor logic, fix up test cases	r1351	one
Matt Mackall merge: allow smarter tool configuration...	r6004	<<<<<<< local
Matt Mackall Repair ancestor logic, fix up test cases	r1351	two-point-five
		=======
		two-point-one
Alexis S. L. Carvalho run-tests.py: pass -L/--label to simplemerge...	r4387	>>>>>>> other
Matt Mackall Repair ancestor logic, fix up test cases	r1351	three
		rev offset length base linkrev nodeid p1 p2
		0 0 7 0 0 01365c4cca56 000000000000 000000000000
		1 7 9 1 1 7b013192566a 01365c4cca56 000000000000
		2 16 15 2 2 8fe46a3eb557 01365c4cca56 000000000000
		3 31 27 2 3 fc3148072371 7b013192566a 8fe46a3eb557
		4 58 25 4 4 d40249267ae3 8fe46a3eb557 000000000000
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 4:a070d41e8360
Matt Mackall Repair ancestor logic, fix up test cases	r1351	tag: tip
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	parent: 2:faaea63e63a9
Matt Mackall Repair ancestor logic, fix up test cases	r1351	user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
Matt Mackall Repair ancestor logic, fix up test cases	r1351	summary: two -> two-point-one

Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 3:451c744aabcc
		parent: 1:e409be6afcc0
		parent: 2:faaea63e63a9
Matt Mackall Repair ancestor logic, fix up test cases	r1351	user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
Matt Mackall Repair ancestor logic, fix up test cases	r1351	summary: Merge 1

Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 2:faaea63e63a9
		parent: 0:095c92b91f1a
Matt Mackall Repair ancestor logic, fix up test cases	r1351	user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
Matt Mackall Repair ancestor logic, fix up test cases	r1351	summary: Numbers as words

Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 1:e409be6afcc0
Matt Mackall Repair ancestor logic, fix up test cases	r1351	user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
Matt Mackall Repair ancestor logic, fix up test cases	r1351	summary: 2 -> 2.5

Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	changeset: 0:095c92b91f1a
Matt Mackall Repair ancestor logic, fix up test cases	r1351	user: test
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	date: Mon Jan 12 13:46:40 1970 +0000
Matt Mackall Repair ancestor logic, fix up test cases	r1351	summary: Initial

	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