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

tests: remove unneeded -d flags...

tests: remove unneeded -d flags Many tests fixed the commit date of their changesets at '1000000 0' or similar. However testing with "Mon Jan 12 13:46:40 1970 +0000" is not better than testing with "Thu Jan 01 00:00:00 1970 +0000", which is the default run-tests.py installs. Removing the unnecessary flag removes some clutter and will hopefully make it clearer what the tests are really trying to test. Some tests did not even change their output when the dates were changed, in which case the -d flag was truly irrelevant. Dates used in sequence (such as '0 0', '1 0', etc...) were left alone since they may make the test easier to understand.

timeless - - Load All Authors

File last commit:

r11716:db426935 stable


                r12156:4c94b6d0

default

Download file

             test-merge-commit.out
        
                    96 lines
            
             | 4.1 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge-commit.out

History | Source | Raw |Copy content |Copy permalink

Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename	r4058	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Matt Mackall merge: introduce mergestate	r6512	merging bar and foo to bar
Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename	r4058	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		% contents of bar should be line0 line1 line2
		line0
		line1
		line2
		rev offset length base linkrev nodeid p1 p2
Ronny Pfannschmidt filelog: sort meta entries, ensure deterministic order	r10490	0 0 77 0 2 d35118874825 000000000000 000000000000
		1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825
Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename	r4058	bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
		rev offset length base linkrev nodeid p1 p2
		0 0 7 0 0 690b295714ae 000000000000 000000000000
		1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Ronny Pfannschmidt filelog: sort meta entries, ensure deterministic order	r10490	4:2263c1be0967 2:0f2ff26688b9
		3:0555950ead28 2:0f2ff26688b9 1:5cd961e4045d
		2:0f2ff26688b9 0:2665aaee66e9
Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename	r4058	1:5cd961e4045d
		0:2665aaee66e9
		% this should use bar@rev2 as the ancestor
Matt Mackall merge: refactor manifestmerge init to better report effective ancestor	r8753	searching for copies back to rev 1
Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename	r4058	resolving manifests
		overwrite None partial False
Ronny Pfannschmidt filelog: sort meta entries, ensure deterministic order	r10490	ancestor 0f2ff26688b9 local 2263c1be0967+ remote 0555950ead28
Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename	r4058	bar: versions differ -> m
Matt Mackall merge: introduce mergestate	r6512	preserving bar for resolve of bar
timeless progress: use gerund (updating) for merge progress	r11716	updating: bar 1/1 files (100.00%)
Matt Mackall merge: allow smarter tool configuration...	r6004	picked tool 'internal:merge' for bar (binary False symlink False)
Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename	r4058	merging bar
Ronny Pfannschmidt filelog: sort meta entries, ensure deterministic order	r10490	my bar@2263c1be0967+ other bar@0555950ead28 ancestor bar@0f2ff26688b9
Matt Mackall merge: allow smarter tool configuration...	r6004	premerge successful
Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename	r4058	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		% contents of bar should be line1 line2
		line1
		line2
		rev offset length base linkrev nodeid p1 p2
Ronny Pfannschmidt filelog: sort meta entries, ensure deterministic order	r10490	0 0 77 0 2 d35118874825 000000000000 000000000000
		1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825
		2 153 7 2 4 ff4b45017382 d35118874825 000000000000
		3 160 13 3 5 3701b4893544 ff4b45017382 5345f5ab8abd
Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename	r4058

		requesting all changes
		adding changesets
		adding manifests
		adding file changes
		added 3 changesets with 3 changes to 2 files (+1 heads)
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Matt Mackall merge: introduce mergestate	r6512	merging foo and bar to bar
Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename	r4058	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		% contents of bar should be line0 line1 line2
		line0
		line1
		line2
		rev offset length base linkrev nodeid p1 p2
Ronny Pfannschmidt filelog: sort meta entries, ensure deterministic order	r10490	0 0 77 0 2 d35118874825 000000000000 000000000000
		1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825
Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename	r4058	bar renamed from foo:9e25c27b87571a1edee5ae4dddee5687746cc8e2
		rev offset length base linkrev nodeid p1 p2
		0 0 7 0 0 690b295714ae 000000000000 000000000000
		1 7 13 1 1 9e25c27b8757 690b295714ae 000000000000
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Ronny Pfannschmidt filelog: sort meta entries, ensure deterministic order	r10490	4:2263c1be0967 2:0f2ff26688b9
		3:3ffa6b9e35f0 1:5cd961e4045d 2:0f2ff26688b9
		2:0f2ff26688b9 0:2665aaee66e9
Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename	r4058	1:5cd961e4045d
		0:2665aaee66e9
		% this should use bar@rev2 as the ancestor
Matt Mackall merge: refactor manifestmerge init to better report effective ancestor	r8753	searching for copies back to rev 1
Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename	r4058	resolving manifests
		overwrite None partial False
Ronny Pfannschmidt filelog: sort meta entries, ensure deterministic order	r10490	ancestor 0f2ff26688b9 local 2263c1be0967+ remote 3ffa6b9e35f0
Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename	r4058	bar: versions differ -> m
Matt Mackall merge: introduce mergestate	r6512	preserving bar for resolve of bar
timeless progress: use gerund (updating) for merge progress	r11716	updating: bar 1/1 files (100.00%)
Matt Mackall merge: allow smarter tool configuration...	r6004	picked tool 'internal:merge' for bar (binary False symlink False)
Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename	r4058	merging bar
Ronny Pfannschmidt filelog: sort meta entries, ensure deterministic order	r10490	my bar@2263c1be0967+ other bar@3ffa6b9e35f0 ancestor bar@0f2ff26688b9
Matt Mackall merge: allow smarter tool configuration...	r6004	premerge successful
Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename	r4058	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		% contents of bar should be line1 line2
		line1
		line2
		rev offset length base linkrev nodeid p1 p2
Ronny Pfannschmidt filelog: sort meta entries, ensure deterministic order	r10490	0 0 77 0 2 d35118874825 000000000000 000000000000
		1 77 76 0 3 5345f5ab8abd 000000000000 d35118874825
		2 153 7 2 4 ff4b45017382 d35118874825 000000000000
		3 160 13 3 5 3701b4893544 ff4b45017382 5345f5ab8abd

	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