upstream/mercurial-mirror Files · tests/test-convert-darcs.out

keyword: make kwfiles --all show unknown files too...

keyword: make kwfiles --all show unknown files too More consistent and similar to hg status.

Bryan O'Sullivan - - Load All Authors

File last commit:

r9326:b236f34e default


                r9492:3b1864bc

default

Download file

             test-convert-darcs.out
        
                    30 lines
            
             | 610 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-convert-darcs.out

History | Annotation | Raw |Copy content |Copy permalink

				% initialize darcs repo
				Finished recording patch 'p0'
				% branch and update
				Finished recording patch 'p1.1'
				% update source
				Finished recording patch 'p1.2'
				% merge branch
				Backing up ./a(-darcs-backup0)
				We have conflicts in the following files:
				./a
				Finished pulling and applying.
				Finished recording patch 'p2'
				initializing destination darcs-repo-hg repository
				scanning source...
				sorting...
				converting...
				3 p0
				2 p1.2
				1 p1.1
				0 p2
				o 3 "p2" files: a
				\|
				o 2 "p1.1" files:
				\|
				o 1 "p1.2" files: a b
				\|
				o 0 "p0" files: a

				7225b30cdf38257d5cc7780772c051b6f33e6d6b 644 a
				1e88685f5ddec574a34c70af492f95b6debc8741 644 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