upstream/mercurial-mirror Files · tests/test-mq-merge.out

hgweb: fix breakage in python < 2.5 introduced in

Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default


                r6374:31a01e3d

default

Download file

             test-mq-merge.out
        
                    13 lines
            
             | 234 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-mq-merge.out

History | Source | Raw |Copy content |Copy permalink

Patrick Mezard Add test for issue 529 - "mq aborts when merging patch deleting files".	r4333	adding a
		adding b
		copy .hg/patches to .hg/patches.1
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		M b
Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Patrick Mezard Add test for issue 529 - "mq aborts when merging patch deleting files".	r4333	a
		b
		merging with queue at: .hg/patches.1
		applying rm_a
		Now at: rm_a
		b
Brendan Cully Make mergepatch save queue now that qpush isn't.	r4437	Patch queue now empty

	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