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

hgweb: all protocol functions have become generators...

hgweb: all protocol functions have become generators Using the write() callable supplied by the start_response() call is frowned upon by the WSGI spec, returning an iterable over the content chunks is the recommended way. Be aware, though: returning many small chunks will slow down responses, because the server has to flush each chunk separately.

Matt Mackall - - Load All Authors

File last commit:

r6518:92ccccb5 default


                r6784:18c429ea

default

Download file

             test-merge9.out
        
                    37 lines
            
             | 725 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge9.out

History | Source | Raw |Copy content |Copy permalink

Alexis S. L. Carvalho merge: fix small bug with a failed merge across a rename...	r4682	adding bar
		adding foo
		adding quux1
		adding quux2
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Alexis S. L. Carvalho merge: fix small bug with a failed merge across a rename...	r4682	merging bar
		merging bar failed!
Matt Mackall merge: introduce mergestate	r6512	merging foo and baz to baz
Matt Mackall merge: allow smarter tool configuration...	r6004	1 files updated, 1 files merged, 0 files removed, 1 files unresolved
Matt Mackall resolve: new command...	r6518	use 'hg resolve' to retry unresolved file merges
		U bar
		R baz
Alexis S. L. Carvalho merge: fix small bug with a failed merge across a rename...	r4682	3 files updated, 0 files merged, 1 files removed, 0 files unresolved
		merging bar
		merging bar failed!
Matt Mackall merge: introduce mergestate	r6512	merging baz and foo to baz
Matt Mackall merge: allow smarter tool configuration...	r6004	1 files updated, 1 files merged, 0 files removed, 1 files unresolved
Matt Mackall resolve: new command...	r6518	use 'hg resolve' to retry unresolved file merges
		% show unresolved
		U bar
		R baz
		% unmark baz
		% show
		U bar
		U baz
		% re-resolve baz
		merging baz and foo to baz
		% after
		U bar
		R baz
		% resolve all
		merging bar
		warning: conflicts during merge.
		merging bar failed!
		% after
		U bar
		R baz

	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