upstream/mercurial-mirror Files · tests/test-merge7.out

If default sorting is name, offer name-descending with one click....

If default sorting is name, offer name-descending with one click. Additionally no longer ignore case when sorting by name to match default sorting. This makes e.g. a repository "FOO" being listed before "bar".

Vadim Gelfer - - Load All Authors

File last commit:

r2019:ced2d362 default


                r2174:3044a3fd

default

Download file

             test-merge7.out
        
                    71 lines
            
             | 2.1 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge7.out

History | Source | Raw |Copy content |Copy permalink

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 Repair ancestor logic, fix up test cases	r1351	merge: warning: conflicts during merge
		merging test.txt
		merging test.txt failed!
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 Repair ancestor logic, fix up test cases	r1351	merge: warning: conflicts during merge
		resolving manifests
		force None allow 1 moddirstate True linear False
		ancestor 055d847dd401 local 2eded9ab0a5c remote 84cf5750dd20
		test.txt versions differ, resolve
		merging test.txt
		resolving test.txt
		file test.txt: my fc3148072371 other d40249267ae3 ancestor 8fe46a3eb557
		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
		(branch merge, don't forget to commit)
Matt Mackall Repair ancestor logic, fix up test cases	r1351	one
Matt Mackall Make test-merge7 repeatable	r1352	<<<<<<<
Matt Mackall Repair ancestor logic, fix up test cases	r1351	two-point-five
		=======
		two-point-one
Matt Mackall Make test-merge7 repeatable	r1352	>>>>>>>
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