upstream/mercurial-mirror Files · tests/test-undo.out

Clean up some merge logic...

Clean up some merge logic - rename mode to branch_merge - use explicit update mode - use negative mtime for updates that set mtime - expand some cryptic variable names - elaborate merge dirstate comments - remove redundant manifest lookup for non-merge case - remove impossible merge case - fix up test cases

mpm@selenic.com - - Load All Authors

File last commit:

r981:4f81068e default


                r993:6f274afc

default

Download file

             test-undo.out
        
                    18 lines
            
             | 446 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-undo.out

History | Annotation | Raw |Copy content |Copy permalink

				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				1 files, 1 changesets, 1 total revisions
				changeset: 0:acb14030fe0a
				tag: tip
				user: test
				date: Thu Jan 1 00:00:00 1970 +0000
				summary: test

				rolling back last transaction
				checking changesets
				checking manifests
				crosschecking files in changesets and manifests
				checking files
				0 files, 0 changesets, 0 total revisions
				A a

	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