upstream/mercurial-mirror Files · tests/test-convert-hg-source.out

make commit fail when committing unresolved files

Matt Mackall - - Load All Authors

File last commit:

r6512:368a4ec6 default


                r6888:7c36a4fb

default

Download file

             test-convert-hg-source.out
        
                    22 lines
            
             | 640 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-convert-hg-source.out

History | Annotation | Raw |Copy content |Copy permalink

				created new head
				merging baz and foo to baz
				1 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				1 files updated, 0 files merged, 1 files removed, 0 files unresolved
				merging foo and baz to baz
				1 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				created new head
				initializing destination new repository
				scanning source...
				sorting...
				converting...
				5 add foo bar
				4 change foo
				3 make bar and baz copies of foo
				2 merge local copy
				1 merge remote copy
				0 mark baz executable
				comparing with ../orig
				searching for changes
				no changes found

	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