mercurial-crew-with-dirclash: tests/test-excessive-merge@05120e210c65 (annotated)

1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	1	#!/bin/sh
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	2
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	3	hg init
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	4
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	5	echo foo > a
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	6	echo foo > b
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	7	hg add a b
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	8
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1716 diff changeset	9	hg ci -m "test" -d "1000000 0"
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	10
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	11	echo blah > a
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	12
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1716 diff changeset	13	hg ci -m "branch a" -d "1000000 0"
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	14
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	15	hg co 0
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	16
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	17	echo blah > b
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	18
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1716 diff changeset	19	hg ci -m "branch b" -d "1000000 0"
2283 e506c14382fd deprecate 'update -m'. use 'merge' instead. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1933 diff changeset	20	HGMERGE=true hg merge 1
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	21
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1716 diff changeset	22	hg ci -m "merge b/a -> blah" -d "1000000 0"
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	23
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	24	hg co 1
2283 e506c14382fd deprecate 'update -m'. use 'merge' instead. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1933 diff changeset	25	HGMERGE=true hg merge 2
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1716 diff changeset	26	hg ci -m "merge a/b -> blah" -d "1000000 0"
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	27
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	28	hg log
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	29	hg debugindex .hg/00changelog.i
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	30
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	31	echo
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	32
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	33	echo 1
3736 ad3d5b4367cb make manifest friendlier Matt Mackall <mpm@selenic.com> parents: 2283 diff changeset	34	hg manifest --debug 1
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	35	echo 2
3736 ad3d5b4367cb make manifest friendlier Matt Mackall <mpm@selenic.com> parents: 2283 diff changeset	36	hg manifest --debug 2
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	37	echo 3
3736 ad3d5b4367cb make manifest friendlier Matt Mackall <mpm@selenic.com> parents: 2283 diff changeset	38	hg manifest --debug 3
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	39	echo 4
3736 ad3d5b4367cb make manifest friendlier Matt Mackall <mpm@selenic.com> parents: 2283 diff changeset	40	hg manifest --debug 4
1716 ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	41
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	42	echo
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	43
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	44	hg debugindex .hg/data/a.i
ef8cd889a78b Refactor excessive merge detection, add test Matt Mackall <mpm@selenic.com> parents: diff changeset	45
2283 e506c14382fd deprecate 'update -m'. use 'merge' instead. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 1933 diff changeset	46	hg verify

author	Thomas Arendsen Hein <thomas@intevation.de>
	Fri, 01 Dec 2006 23:27:53 +0100
changeset 3755	05120e210c65
parent 3736	ad3d5b4367cb
child 3853	c0b449154a90
permissions	-rwxr-xr-x