mercurial-crew-with-dirclash: tests/test-unrelated-pull@1f3710636b45 (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
ffeb2c3a1966 Actually warn on pulling from an unrelated repository mpm@selenic.com parents: diff changeset	13	hg init
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	Samuel Tardieu <sam@rfc1149.net>
	Fri, 19 Aug 2005 23:23:42 -0800
changeset 967	1f3710636b45
parent 814	0902ffece4b4
child 1308	2073e5a71008
permissions	-rwxr-xr-x