mercurial-crew-with-dirclash: tests/test-up-local-change@46a8dd3145cc (annotated)

544 3d4d5f2aba9a Remove bashisms and use /bin/sh instead of /bin/bash. Thomas Arendsen Hein <thomas@intevation.de> parents: 485 diff changeset	1	#!/bin/sh
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	3	set -ex
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	4	mkdir r1
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	5	cd r1
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	6	hg init
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	7	echo a > a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	8	hg addremove
749 7e4843b7efd2 Update tests to use commit -m and default -u mpm@selenic.com parents: 591 diff changeset	9	hg commit -m "1" -d "0 0"
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	10
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 350 diff changeset	11	hg clone . ../r2
c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 350 diff changeset	12	cd ../r2
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	13	hg up
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	14	echo abc > a
332 6c869059beb4 testing fixups mpm@selenic.com parents: 331 diff changeset	15	hg diff > ../d
774 6592c4f5cd4f Change sed patterns in tests to strip dates after spaces or tabs mpm@selenic.com parents: 749 diff changeset	16	sed "s/\(\(---\\|+++\) [^ \t]\)[ \t]./\1/" < ../d
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	17
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	18	cd ../r1
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	19	echo b > b
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	20	echo a2 > a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	21	hg addremove
749 7e4843b7efd2 Update tests to use commit -m and default -u mpm@selenic.com parents: 591 diff changeset	22	hg commit -m "2" -d "0 0"
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	23
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	24	cd ../r2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	25	hg -q pull ../r1
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	26	hg status
591 eb46971fc57f options: kill -d for debug mpm@selenic.com parents: 547 diff changeset	27	hg --debug up
eb46971fc57f options: kill -d for debug mpm@selenic.com parents: 547 diff changeset	28	hg --debug up -m
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	29	hg parents
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	30	hg -v history
332 6c869059beb4 testing fixups mpm@selenic.com parents: 331 diff changeset	31	hg diff > ../d
774 6592c4f5cd4f Change sed patterns in tests to strip dates after spaces or tabs mpm@selenic.com parents: 749 diff changeset	32	sed "s/\(\(---\\|+++\) [^ \t]\)[ \t]./\1/" < ../d
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	33

author	mpm@selenic.com
	Wed, 27 Jul 2005 18:16:20 -0800
changeset 785	46a8dd3145cc
parent 774	6592c4f5cd4f
child 793	445970ccf57a
child 808	8f5637f0a0c0
child 814	0902ffece4b4
permissions	-rwxr-xr-x