mercurial-crew-with-dirclash: tests/test-merge1@6409d9a0df43 (annotated)

407 0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	1	#!/bin/sh -x
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	2
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	3	cat <<'EOF' > merge
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	4	#!/bin/sh
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	5	echo merging for `basename $1`
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	6	EOF
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	7	chmod +x merge
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	8
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	9	mkdir t
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	10	cd t
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	11	hg init
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	12	echo This is file a1 > a
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	13	hg add a
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	14	hg commit -t "commit #0" -d "0 0" -u user
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	15	echo This is file b1 > b
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	16	hg add b
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	17	hg commit -t "commit #1" -d "0 0" -u user
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	18
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	19	hg update 0
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	20	echo This is file c1 > c
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	21	hg add c
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	22	hg commit -t "commit #2" -d "0 0" -u user
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	23	echo This is file b1 > b
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	24	env HGMERGE=../merge hg update -m 1
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	25	# no merges expected
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	26	cd ..; /bin/rm -rf t
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	27
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	28	mkdir t
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	29	cd t
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	30	hg init
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	31	echo This is file a1 > a
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	32	hg add a
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	33	hg commit -t "commit #0" -d "0 0" -u user
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	34	echo This is file b1 > b
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	35	hg add b
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	36	hg commit -t "commit #1" -d "0 0" -u user
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	37
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	38	hg update 0
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	39	echo This is file c1 > c
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	40	hg add c
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	41	hg commit -t "commit #2" -d "0 0" -u user
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	42	echo This is file b2 > b
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	43	env HGMERGE=../merge hg update -m 1
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	44	# merge of b expected
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	45	cd ..; /bin/rm -rf t
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	46
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	47	mkdir t
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	48	cd t
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	49	hg init
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	50	echo This is file a1 > a
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	51	hg add a
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	52	hg commit -t "commit #0" -d "0 0" -u user
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	53	echo This is file b1 > b
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	54	hg add b
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	55	hg commit -t "commit #1" -d "0 0" -u user
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	56	echo This is file b22 > b
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	57	hg commit -t "commit #2" -d "0 0" -u user
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	58	hg update 1
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	59	echo This is file c1 > c
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	60	hg add c
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	61	hg commit -t "commit #3" -d "0 0" -u user
430 5b22029b5aa2 Fix up test-merge1 mpm@selenic.com parents: 407 diff changeset	62	cat b
407 0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	63	echo This is file b22 > b
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	64	env HGMERGE=../merge hg update -m 2
430 5b22029b5aa2 Fix up test-merge1 mpm@selenic.com parents: 407 diff changeset	65	# merge expected!
407 0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	66	cd ..; /bin/rm -rf t
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	67
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	68	mkdir t
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	69	cd t
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	70	hg init
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	71	echo This is file a1 > a
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	72	hg add a
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	73	hg commit -t "commit #0" -d "0 0" -u user
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	74	echo This is file b1 > b
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	75	hg add b
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	76	hg commit -t "commit #1" -d "0 0" -u user
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	77	echo This is file b22 > b
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	78	hg commit -t "commit #2" -d "0 0" -u user
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	79	hg update 1
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	80	echo This is file c1 > c
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	81	hg add c
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	82	hg commit -t "commit #3" -d "0 0" -u user
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	83	echo This is file b33 > b
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	84	env HGMERGE=../merge hg update -m 2
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	85	# merge of b expected
0e0d0670b2bc [PATCH] Merging identical changes from another branch mpm@selenic.com parents: diff changeset	86	cd ..; /bin/rm -rf t

author	mpm@selenic.com
	Fri, 24 Jun 2005 22:51:39 -0800
changeset 460	6409d9a0df43
parent 430	5b22029b5aa2
child 749	7e4843b7efd2
permissions	-rwxr-xr-x