upstream/mercurial-mirror Files · tests/test-issue619

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
        
                    20 lines
            
             | 257 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-issue619

History | Annotation | Raw |Copy content |Copy permalink

				#!/bin/sh

				mkdir t
				cd t
				hg init
				echo a > a
				hg ci -Ama -d '1000000000 0'
				echo b > b
				hg branch b
				hg ci -Amb -d '1000000000 0'
				hg co -C 0

				echo fast-forward
				hg merge b
				hg ci -Ammerge -d '1000000000 0'

				echo bogus fast-forward should fail
				hg merge b

				echo 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