upstream/mercurial-mirror Files · tests/test-conflict

convert: cvs.py - Allow user to use built-in CVS changeset code....

convert: cvs.py - Allow user to use built-in CVS changeset code. tests: add two testcases for CVS conversion with builtin CVS including a testcase for issue 1148.

Alexis S. L. Carvalho - - Load All Authors

File last commit:

r4387:93a4e72b default


                r6690:127e8c34

default

Download file

             test-conflict
        
                    15 lines
            
             | 244 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-conflict

History | Annotation | Raw |Copy content |Copy permalink

				#!/bin/sh

				hg init
				echo "nothing" > a
				hg add a
				hg commit -m ancestor -d "1000000 0"
				echo "something" > a
				hg commit -m branch1 -d "1000000 0"
				hg co 0
				echo "something else" > a
				hg commit -m branch2 -d "1000000 0"
				hg merge 1
				hg id
				cat a
				hg status

	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