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

Fix up copy command to behave more like regular "cp"....

Fix up copy command to behave more like regular "cp". In addition to recording changes, copy now updates the working directory.

mpm@selenic.com - - Load All Authors

File last commit:

r1236:67a28636 default


                r1249:a5355fa5

default

Download file

             test-merge1
        
                    90 lines
            
             | 1.6 KiB
            
                | text/plain
            
             |
                TextLexer

/ tests / test-merge1

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] Merging identical changes from another branch...	r407
		cat <<'EOF' > merge
		#!/bin/sh
		echo merging for `basename $1`
		EOF
		chmod +x merge

		mkdir t
		cd t
		hg init
		echo This is file a1 > a
		hg add a
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg commit -m "commit #0" -d "0 0"
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	echo This is file b1 > b
		hg add b
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg commit -m "commit #1" -d "0 0"
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407
		hg update 0
		echo This is file c1 > c
		hg add c
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg commit -m "commit #2" -d "0 0"
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	echo This is file b1 > b
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	echo %% no merges expected
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	env HGMERGE=../merge hg update -m 1
		cd ..; /bin/rm -rf t

		mkdir t
		cd t
		hg init
		echo This is file a1 > a
		hg add a
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg commit -m "commit #0" -d "0 0"
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	echo This is file b1 > b
		hg add b
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg commit -m "commit #1" -d "0 0"
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407
		hg update 0
		echo This is file c1 > c
		hg add c
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg commit -m "commit #2" -d "0 0"
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	echo This is file b2 > b
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	echo %% merge of b expected
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	env HGMERGE=../merge hg update -m 1
		cd ..; /bin/rm -rf t
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	echo %%
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407
		mkdir t
		cd t
		hg init
		echo This is file a1 > a
		hg add a
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg commit -m "commit #0" -d "0 0"
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	echo This is file b1 > b
		hg add b
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg commit -m "commit #1" -d "0 0"
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	echo This is file b22 > b
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg commit -m "commit #2" -d "0 0"
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	hg update 1
		echo This is file c1 > c
		hg add c
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg commit -m "commit #3" -d "0 0"
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236
		echo 'Contents of b should be "this is file b1"'
mpm@selenic.com Fix up test-merge1...	r430	cat b
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	echo This is file b22 > b
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	echo %% merge expected!
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	env HGMERGE=../merge hg update -m 2
		cd ..; /bin/rm -rf t

		mkdir t
		cd t
		hg init
		echo This is file a1 > a
		hg add a
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg commit -m "commit #0" -d "0 0"
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	echo This is file b1 > b
		hg add b
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg commit -m "commit #1" -d "0 0"
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	echo This is file b22 > b
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg commit -m "commit #2" -d "0 0"
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	hg update 1
		echo This is file c1 > c
		hg add c
mpm@selenic.com Update tests to use commit -m and default -u...	r749	hg commit -m "commit #3" -d "0 0"
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	echo This is file b33 > b
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	echo %% merge of b expected
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	env HGMERGE=../merge hg update -m 2
		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