upstream/mercurial-mirror Files · tests/test-issue619.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.

Matt Mackall - - Load All Authors

File last commit:

r4748:8808ea7d default


                r5980:dcda0c90

default

Download file

             test-issue619.out
        
                    10 lines
            
             | 358 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-issue619.out

History | Annotation | Raw |Copy content |Copy permalink

				adding a
				marked working directory as branch b
				adding b
				0 files updated, 0 files merged, 1 files removed, 0 files unresolved
				fast-forward
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				bogus fast-forward should fail
				abort: there is nothing to merge, just use 'hg update' or look at 'hg heads'
				done

	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