mercurial-crew-with-dirclash: tests/test-unrelated-pull@0f1d2c75db5e (annotated)

749 7e4843b7efd2 Update tests to use commit -m and default -u mpm@selenic.com parents: 579 diff changeset	1	#!/bin/sh
7e4843b7efd2 Update tests to use commit -m and default -u mpm@selenic.com parents: 579 diff changeset	2
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: diff changeset	3	mkdir a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: diff changeset	4	cd a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: diff changeset	5	hg init
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: diff changeset	6	echo 123 > a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: diff changeset	7	hg add a
749 7e4843b7efd2 Update tests to use commit -m and default -u mpm@selenic.com parents: 579 diff changeset	8	hg commit -m "a" -u a -d "0 0"
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: diff changeset	9
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: diff changeset	10	cd ..
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: diff changeset	11	mkdir b
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: diff changeset	12	cd b
1308 2073e5a71008 Cleanup of tabs and trailing spaces. Thomas Arendsen Hein <thomas@intevation.de> parents: 814 diff changeset	13	hg init
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: diff changeset	14	echo 321 > b
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: diff changeset	15	hg add b
749 7e4843b7efd2 Update tests to use commit -m and default -u mpm@selenic.com parents: 579 diff changeset	16	hg commit -m "b" -u b -d "0 0"
579 ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: diff changeset	17
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: diff changeset	18	hg pull ../a
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: diff changeset	19	hg heads

author	Vadim Gelfer <vadim.gelfer@gmail.com>
	Wed, 15 Feb 2006 10:49:30 -0800
changeset 1730	0f1d2c75db5e
parent 1308	2073e5a71008
child 1933	7544700fd931
permissions	-rwxr-xr-x