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

Alexis S. L. Carvalho - - Load All Authors

File last commit:

r5227:46632396 default


                r5980:dcda0c90

default

Download file

             test-changelog-exec.out
        
                    21 lines
            
             | 520 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-changelog-exec.out

History | Annotation | Raw |Copy content |Copy permalink

				% manifest of p2:
				bar
				foo

				% manifest of p1:
				foo
				1 files updated, 0 files merged, 0 files removed, 0 files unresolved
				(branch merge, don't forget to commit)
				% this should not mention bar:
				changeset: 3:ef2fc9b4a51b
				tag: tip
				parent: 2:ed1b79f46b9a
				parent: 1:d394a8db219b
				user: test
				date: Thu Jan 01 00:00:00 1970 +0000
				description:
				merge


				rev offset length base linkrev nodeid p1 p2
				0 0 5 0 1 b004912a8510 000000000000 000000000000

	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