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

Moving hgweb.py into it's own module in preparation for breaking it up.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r2175:b2ae81a7 default


                r2311:b832b6eb

default

Download file

             test-merge1.out
        
                    31 lines
            
             | 1.1 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge1.out

History | Source | Raw |Copy content |Copy permalink

Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	%% no merges expected
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		0 files updated, 0 files merged, 1 files removed, 0 files unresolved
Benoit Boissinot abort when merging two heads and repository has local changes	r1581	%% merge should fail
		abort: 'b' already exists in the working dir and differs from remote
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	%% merge of b expected
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	merging for b
		merging b
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	%%
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	Contents of b should be "this is file b1"
mpm@selenic.com Fix up test-merge1...	r430	This is file b1
Benoit Boissinot abort when merging two heads and repository has local changes	r1581	%% merge fails
mcmillen@cs.cmu.edu Spelling fix: "commited" -> "committed"	r1995	abort: outstanding uncommitted changes
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	%% merge expected!
mpm@selenic.com Fix up test-merge1...	r430	merging for b
		merging b
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
Benoit Boissinot abort when merging two heads and repository has local changes	r1581	%% merge of b should fail
mcmillen@cs.cmu.edu Spelling fix: "commited" -> "committed"	r1995	abort: outstanding uncommitted changes
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	%% merge of b expected
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	merging for b
		merging b
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 1 files merged, 0 files removed, 0 files unresolved
		(branch merge, don't forget to commit)

	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