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

fix traceback of extdiff after a merge...

fix traceback of extdiff after a merge - files that comes from a different branch are marked as modified but aren't present in the original manifest - add a testcase for extdiff and for regular diff

Benoit Boissinot - - Load All Authors

File last commit:

r3330:49966b5a default


                r3330:49966b5a

default

Download file

             test-merge1
        
                    104 lines
            
             | 2.0 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
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] Merging identical changes from another branch...	r407	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] Merging identical changes from another branch...	r407
		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"
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
Vadim Gelfer deprecate 'update -m'. use 'merge' instead.	r2283	env HGMERGE=../merge hg merge 1
Benoit Boissinot fix traceback of extdiff after a merge...	r3330	hg diff --nodates
		hg status
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	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 [PATCH] Merging identical changes from another branch...	r407	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] Merging identical changes from another branch...	r407
		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"
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	echo This is file b2 > b
Benoit Boissinot abort when merging two heads and repository has local changes	r1581	echo %% merge should fail
Vadim Gelfer deprecate 'update -m'. use 'merge' instead.	r2283	env HGMERGE=../merge hg merge 1
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	echo %% merge of b expected
Vadim Gelfer deprecate 'update -m'. use 'merge' instead.	r2283	env HGMERGE=../merge hg merge -f 1
Benoit Boissinot fix traceback of extdiff after a merge...	r3330	hg diff --nodates
		hg status
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	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
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] Merging identical changes from another branch...	r407	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] Merging identical changes from another branch...	r407	echo This is file b22 > 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 [PATCH] Merging identical changes from another branch...	r407	hg update 1
		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 #3" -d "1000000 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
Benoit Boissinot abort when merging two heads and repository has local changes	r1581	echo %% merge fails
Vadim Gelfer deprecate 'update -m'. use 'merge' instead.	r2283	env HGMERGE=../merge hg merge 2
mpm@selenic.com Fix bug with co -C across branches, update tests	r1236	echo %% merge expected!
Vadim Gelfer deprecate 'update -m'. use 'merge' instead.	r2283	env HGMERGE=../merge hg merge -f 2
Benoit Boissinot fix traceback of extdiff after a merge...	r3330	hg diff --nodates
		hg status
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	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 [PATCH] Merging identical changes from another branch...	r407	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] Merging identical changes from another branch...	r407	echo This is file b22 > 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 [PATCH] Merging identical changes from another branch...	r407	hg update 1
		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 #3" -d "1000000 0"
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	echo This is file b33 > b
Benoit Boissinot abort when merging two heads and repository has local changes	r1581	echo %% merge of b should fail
Vadim Gelfer deprecate 'update -m'. use 'merge' instead.	r2283	env HGMERGE=../merge hg merge 2
Benoit Boissinot abort when merging two heads and repository has local changes	r1581	echo %% merge of b expected
Vadim Gelfer deprecate 'update -m'. use 'merge' instead.	r2283	env HGMERGE=../merge hg merge -f 2
Benoit Boissinot fix traceback of extdiff after a merge...	r3330	hg diff --nodates
		hg status
mpm@selenic.com [PATCH] Merging identical changes from another branch...	r407	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