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

abort when merging two heads and repository has local changes

mpm@selenic.com - - Load All Authors

File last commit:

r993:6f274afc default


                r1581:db10b711

default

Download file

             test-rawcommit1.out
        
                    53 lines
            
             | 1.5 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-rawcommit1.out

History | Source | Raw |Copy content |Copy permalink

mpm@selenic.com Add rawcommit tests...	r444	05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
		54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
		05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
		54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
		76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
mpm@selenic.com Fix tests for short changeset hashes and hidden manifest hashes	r784	changeset: 2:9f827976dae4
mpm@selenic.com Add rawcommit tests...	r444	tag: tip
mpm@selenic.com Update tests to use commit -m and default -u...	r749	user: test
Samuel Tardieu [PATCH] Print timezone offset when outputting dates...	r967	date: Thu Jan 1 00:00:00 1970 +0000
mpm@selenic.com options: kill -d for debug...	r591	summary: 2
Thomas Arendsen Hein Add an empty line after description in verbose mode of show_changeset....	r546
mpm@selenic.com Add rawcommit tests...	r444	05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
		76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
mpm@selenic.com Clean up some merge logic...	r993	changeset: 3:142428fbbcc5
mpm@selenic.com Add rawcommit tests...	r444	tag: tip
mpm@selenic.com Update tests to use commit -m and default -u...	r749	user: test
Samuel Tardieu [PATCH] Print timezone offset when outputting dates...	r967	date: Thu Jan 1 00:00:00 1970 +0000
mpm@selenic.com options: kill -d for debug...	r591	summary: 3
Thomas Arendsen Hein Add an empty line after description in verbose mode of show_changeset....	r546
mpm@selenic.com Add rawcommit tests...	r444	d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
		76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
mpm@selenic.com Clean up some merge logic...	r993	changeset: 4:4d450f9aa680
mpm@selenic.com Add rawcommit tests...	r444	tag: tip
mpm@selenic.com Update tests to use commit -m and default -u...	r749	user: test
Samuel Tardieu [PATCH] Print timezone offset when outputting dates...	r967	date: Thu Jan 1 00:00:00 1970 +0000
mpm@selenic.com options: kill -d for debug...	r591	summary: 4
Thomas Arendsen Hein Add an empty line after description in verbose mode of show_changeset....	r546
mpm@selenic.com Add rawcommit tests...	r444	05f9e54f4c9b86b09099803d8b49a50edcb4eaab 644 a
		54837d97f2932a8194e69745a280a2c11e61ff9c 644 b
		3570202ceac2b52517df64ebd0a062cb0d8fe33a 644 c
mpm@selenic.com Clean up some merge logic...	r993	changeset: 4:4d450f9aa680
mpm@selenic.com Update tests to use commit -m and default -u...	r749	user: test
Samuel Tardieu [PATCH] Print timezone offset when outputting dates...	r967	date: Thu Jan 1 00:00:00 1970 +0000
mpm@selenic.com options: kill -d for debug...	r591	summary: 4
mpm@selenic.com Add rawcommit tests...	r444
		d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
		76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
mpm@selenic.com Clean up some merge logic...	r993	changeset: 6:b4b8b9afa8cc
mpm@selenic.com Add rawcommit tests...	r444	tag: tip
mpm@selenic.com Clean up some merge logic...	r993	parent: 4:4d450f9aa680
mpm@selenic.com Fix tests for short changeset hashes and hidden manifest hashes	r784	parent: 5:a7925a42d0df
mpm@selenic.com Update tests to use commit -m and default -u...	r749	user: test
Samuel Tardieu [PATCH] Print timezone offset when outputting dates...	r967	date: Thu Jan 1 00:00:00 1970 +0000
mpm@selenic.com options: kill -d for debug...	r591	summary: 6
mpm@selenic.com Add rawcommit tests...	r444
		d6e3c4976c13feb1728cd3ac851abaf7256a5c23 644 a
		76d5e637cbec1bcc04a5a3fa4bcc7d13f6847c00 644 c
mpm@selenic.com Clean up some merge logic...	r993	changeset: 7:f84d0b1b024e
mpm@selenic.com Add rawcommit tests...	r444	tag: tip
mpm@selenic.com Update tests to use commit -m and default -u...	r749	user: test
Samuel Tardieu [PATCH] Print timezone offset when outputting dates...	r967	date: Thu Jan 1 00:00:00 1970 +0000
mpm@selenic.com options: kill -d for debug...	r591	summary: 7
mpm@selenic.com Add rawcommit tests...	r444

	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