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

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.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r2992:4e815ee3 default


                r6206:0b6f1249

default

Download file

             test-strict
        
                    18 lines
            
             | 209 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-strict

History | Annotation | Raw |Copy content |Copy permalink

				#!/bin/sh

				hg init

				echo a > a
				hg ci -d '0 0' -Ama

				hg an a

				echo "[ui]" >> $HGRCPATH
				echo "strict=True" >> $HGRCPATH

				hg an a
				hg annotate a

				echo % should succeed - up is an alias, not an abbreviation

				hg up

	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