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

patch: support diff data loss detection and upgrade...

patch: support diff data loss detection and upgrade In worst case, generating diff in upgrade mode can be two times more expensive than generating it in git mode directly: we may have to regenerate the whole diff again whenever a git feature is detected. Also, the first diff attempt is completely buffered instead of being streamed. That said, even without having profiled it yet, I am convinced we can fast-path the upgrade mode if necessary were it to be used in regular diff commands, and not only in mq where avoiding data loss is worth the price.

Matt Mackall - - Load All Authors

File last commit:

r8753:af5f099d default


                r10189:e451e599

default

Download file

             test-merge-commit.out
        
                    94 lines
            
             | 4.0 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
		0 0 77 0 2 da78c0659611 000000000000 000000000000
		1 77 76 0 3 4b358025380b 000000000000 da78c0659611
		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
Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename	r4058	4:2d2f9a22c82b 2:0a3ab4856510
		3:7d3b554bfdf1 2:0a3ab4856510 1:5cd961e4045d
		2:0a3ab4856510 0:2665aaee66e9
		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
		ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 7d3b554bfdf1
		bar: versions differ -> m
Matt Mackall merge: introduce mergestate	r6512	preserving bar for resolve of bar
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
		my bar@2d2f9a22c82b+ other bar@7d3b554bfdf1 ancestor bar@0a3ab4856510
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
		0 0 77 0 2 da78c0659611 000000000000 000000000000
		1 77 76 0 3 4b358025380b 000000000000 da78c0659611
		2 153 7 2 4 4defe5eec418 da78c0659611 000000000000
		3 160 13 3 5 4663501da27b 4defe5eec418 4b358025380b


		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
		0 0 77 0 2 da78c0659611 000000000000 000000000000
		1 77 76 0 3 4b358025380b 000000000000 da78c0659611
		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
Alexis S. L. Carvalho filecommit: don't forget the local parent on a merge with a local rename	r4058	4:2d2f9a22c82b 2:0a3ab4856510
		3:96ab80c60897 1:5cd961e4045d 2:0a3ab4856510
		2:0a3ab4856510 0:2665aaee66e9
		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
		ancestor 0a3ab4856510 local 2d2f9a22c82b+ remote 96ab80c60897
		bar: versions differ -> m
Matt Mackall merge: introduce mergestate	r6512	preserving bar for resolve of bar
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
		my bar@2d2f9a22c82b+ other bar@96ab80c60897 ancestor bar@0a3ab4856510
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
		0 0 77 0 2 da78c0659611 000000000000 000000000000
		1 77 76 0 3 4b358025380b 000000000000 da78c0659611
		2 153 7 2 4 4defe5eec418 da78c0659611 000000000000
		3 160 13 3 5 4663501da27b 4defe5eec418 4b358025380b

	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