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

fetch: switch the default parent used for a merge...

fetch: switch the default parent used for a merge This treats newly pulled changes as authoritative, and local changes as the "satellite" changes. The prior default behaviour is still available, via the --switch-parent option.

Patrick Mezard - - Load All Authors

File last commit:

r5405:8feb33c2 default


                r6206:0b6f1249

default

Download file

             test-merge6.out
        
                    25 lines
            
             | 985 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge6.out

History | Source | Raw |Copy content |Copy permalink

Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
		1 files updated, 0 files merged, 0 files removed, 0 files unresolved
		2 files updated, 0 files merged, 0 files removed, 0 files unresolved
maf46@burn.cl.cam.ac.uk Fix zombie files in merge...	r616	pulling from ../B1
		searching for changes
		adding changesets
		adding manifests
mpm@selenic.com Fix up test results...	r775	adding file changes
mpm@selenic.com Update tests	r1043	added 1 changesets with 1 changes to 1 files (+1 heads)
Vadim Gelfer add merge command. means same thing as "update -m"....	r2019	(run 'hg heads' to see heads, 'hg merge' to merge)
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)
maf46@burn.cl.cam.ac.uk Fix zombie files in merge...	r616	bar should remain deleted.
Patrick Mezard Display symlink or executable bit with manifest -v...	r5405	f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo
maf46@burn.cl.cam.ac.uk Fix zombie files in merge...	r616	pulling from ../A2
		searching for changes
		adding changesets
		adding manifests
mpm@selenic.com Fix up test results...	r775	adding file changes
mpm@selenic.com Update tests	r1043	added 1 changesets with 0 changes to 0 files (+1 heads)
Vadim Gelfer add merge command. means same thing as "update -m"....	r2019	(run 'hg heads' to see heads, 'hg merge' to merge)
Thomas Arendsen Hein Make hg update more verbose by default (issue12)...	r2175	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
		(branch merge, don't forget to commit)
maf46@burn.cl.cam.ac.uk Fix zombie files in merge...	r616	bar should remain deleted.
Patrick Mezard Display symlink or executable bit with manifest -v...	r5405	f9b0e817f6a48de3564c6b2957687c5e7297c5a0 644 foo

	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