mercurial: tests/test-merge6@9514cbb6e4f6 (annotated)

800 ec85f9e6f3b1 Don't use 'set -x', fix exports, sed and hexdump usage for Solaris. Thomas Arendsen Hein <thomas@intevation.de> parents: 749 diff changeset	1	#!/bin/sh
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	2
4295 a74586023196 test-merge6: avoid a shell script Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3736 diff changeset	3	cat <<EOF > merge
a74586023196 test-merge6: avoid a shell script Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3736 diff changeset	4	import sys, os
a74586023196 test-merge6: avoid a shell script Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3736 diff changeset	5	print "merging for", os.path.basename(sys.argv[1])
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	6	EOF
4295 a74586023196 test-merge6: avoid a shell script Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3736 diff changeset	7	HGMERGE="python ../merge"; export HGMERGE
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	8
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	9	mkdir A1
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	10	cd A1
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	11	hg init
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	12	echo This is file foo1 > foo
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	13	echo This is file bar1 > bar
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	14	hg add foo bar
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 814 diff changeset	15	hg commit -m "commit text" -d "1000000 0"
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	16
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	17	cd ..
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	18	hg clone A1 B1
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	19
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	20	cd A1
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	21	rm bar
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	22	hg remove bar
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 814 diff changeset	23	hg commit -m "commit test" -d "1000000 0"
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	24
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	25	cd ../B1
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	26	echo This is file foo22 > foo
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 814 diff changeset	27	hg commit -m "commit test" -d "1000000 0"
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	28
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	29	cd ..
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	30	hg clone A1 A2
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	31	hg clone B1 B2
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	32
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	33	cd A1
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	34	hg pull ../B1
2283 e506c14382fd deprecate 'update -m'. use 'merge' instead. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1933 diff changeset	35	hg merge
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 814 diff changeset	36	hg commit -m "commit test" -d "1000000 0"
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	37	echo bar should remain deleted.
3736 ad3d5b4367cb make manifest friendlier Matt Mackall <mpm@selenic.com> parents: 2283 diff changeset	38	hg manifest --debug
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	39
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	40	cd ../B2
d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	41	hg pull ../A2
2283 e506c14382fd deprecate 'update -m'. use 'merge' instead. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1933 diff changeset	42	hg merge
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 814 diff changeset	43	hg commit -m "commit test" -d "1000000 0"
616 d45d1c90032e Fix zombie files in merge maf46@burn.cl.cam.ac.uk parents: diff changeset	44	echo bar should remain deleted.
3736 ad3d5b4367cb make manifest friendlier Matt Mackall <mpm@selenic.com> parents: 2283 diff changeset	45	hg manifest --debug

author	Benoit Boissinot <benoit.boissinot@ens-lyon.org>
	Tue, 14 Oct 2008 20:13:53 +0200
changeset 7104	9514cbb6e4f6
parent 4295	a74586023196
permissions	-rwxr-xr-x