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

parents: make it match the doc when called on a file...

parents: make it match the doc when called on a file parents used to return the parent revision of the last revision updating selected file, instead of the updating revision itself.

Vadim Gelfer - - Load All Authors

File last commit:

r2283:e506c143 default


                r5298:cba2a689

default

Download file

             test-merge4
        
                    17 lines
            
             | 335 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge4

History | Source | Raw |Copy content |Copy permalink

Thomas Arendsen Hein Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.	r800	#!/bin/sh
mpm@selenic.com [PATCH] Removal of a file added by merging branches...	r416
		hg init
		echo This is file a1 > a
		hg add a
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -m "commit #0" -d "1000000 0"
mpm@selenic.com [PATCH] Removal of a file added by merging branches...	r416	echo This is file b1 > b
		hg add b
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -m "commit #1" -d "1000000 0"
mpm@selenic.com [PATCH] Removal of a file added by merging branches...	r416	hg update 0
		echo This is file c1 > c
		hg add c
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -m "commit #2" -d "1000000 0"
Vadim Gelfer deprecate 'update -m'. use 'merge' instead.	r2283	hg merge 1
mpm@selenic.com [PATCH] Removal of a file added by merging branches...	r416	rm b
		echo This is file c22 > c
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -m "commit #3" -d "1000000 0"

	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