mercurial-crew-with-dirclash: tests/test-unrelated-pull annotate

annotate tests/test-unrelated-pull @ 800:ec85f9e6f3b1

Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.

author	Thomas Arendsen Hein <thomas@intevation.de>
date	Fri, 29 Jul 2005 15:19:43 +0100
parents	7e4843b7efd2
children	8f5637f0a0c0

rev	line source
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