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

Minor typo change to reflect actual values used.

Thomas Arendsen Hein - - Load All Authors

File last commit:

r1933:7544700f default


                r2338:391c5d0f

default

Download file

             test-merge2
        
                    48 lines
            
             | 856 B
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge2

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 Pick up tests from previous patch...	r409
		mkdir t
		cd t
		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 Pick up tests from previous patch...	r409	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 Pick up tests from previous patch...	r409	rm b
		hg update 0
		echo This is file b2 > 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 #2" -d "1000000 0"
mpm@selenic.com Pick up tests from previous patch...	r409	cd ..; /bin/rm -rf t

		mkdir t
		cd t
		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 Pick up tests from previous patch...	r409	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 Pick up tests from previous patch...	r409	rm b
		hg update 0
		echo This is file b2 > b
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -A -m "commit #2" -d "1000000 0"
mpm@selenic.com Pick up tests from previous patch...	r409	cd ..; /bin/rm -rf t

		mkdir t
		cd t
		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 Pick up tests from previous patch...	r409	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 Pick up tests from previous patch...	r409	rm b
		hg remove b
		hg update 0
		echo This is file b2 > b
Thomas Arendsen Hein Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero....	r1933	hg commit -A -m "commit #2" -d "1000000 0"
mpm@selenic.com Pick up tests from previous patch...	r409	cd ..; /bin/rm -rf t

	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