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

mq: pop/refresh: avoid losing revisions not managed by mq...

mq: pop/refresh: avoid losing revisions not managed by mq We already disallow committing on top of an mq revision exactly to avoid losing this new revision during a qpop/qrefresh, so this can be seen as an additional safety check. If this is not enough to fix issue844, it should at least prevent it from happening.

Maxim Dounin - - Load All Authors

File last commit:

r5811:180a3eee default


                r5980:dcda0c90

default

Download file

             test-convert-hg-source.out
        
                    19 lines
            
             | 570 B
            
                | text/plain
            
             |
                TextLexer

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

History | Annotation | Raw |Copy content |Copy permalink

				merging baz and foo
				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
				1 files updated, 1 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				initializing destination new repository
				scanning source...
				sorting...
				converting...
				4 add foo bar
				3 change foo
				2 make bar and baz copies of foo
				1 merge local copy
				0 merge remote copy
				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