upstream/mercurial-mirror Files · tests/test-journal-exists

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.

Giorgos Keramidas - - Load All Authors

File last commit:

r5867:b6d8972c default


                r6206:0b6f1249

default

Download file

             test-journal-exists
        
                    12 lines
            
             | 103 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-journal-exists

History | Source | Raw |Copy content |Copy permalink

Giorgos Keramidas tests: Use /bin/sh for test-journal-exists, /bin/bash may not be available	r5867	#!/bin/sh
Matt Mackall transactions: don't show a backtrace when journal exists...	r5865
		hg init
		echo a > a
		hg ci -Am0

		touch .hg/store/journal

		echo foo > a
		hg ci -Am0

		hg recover

	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