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

Make contrib/buildrpm work on Fedora 9....

Make contrib/buildrpm work on Fedora 9. mercurial.spec had bitrotted. These changes makes it possible to build an rpm that is usable. Only minimal changes has been made, and there is plenty of room for improvement.

Dirkjan Ochtman - - Load All Authors

File last commit:

r6336:4b0c9c67 default


                r7277:3e000e2b

default

Download file

             test-merge-force.out
        
                    11 lines
            
             | 298 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge-force.out

History | Source | Raw |Copy content |Copy permalink

Dirkjan Ochtman warn about new heads on commit (issue842)	r6336	created new head
Alexis S. L. Carvalho add a test for a375ffc2aa1b	r6255	% local deleted a file, remote removed
Alexis S. L. Carvalho merge: require --force when there are deleted files	r6256	abort: outstanding uncommitted changes
Alexis S. L. Carvalho add a test for a375ffc2aa1b	r6255	resolving manifests
		removing a
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		% should show a as removed
		R a
		% manifest. should not have a:
		b

	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