mercurial-crew-with-dirclash: tests/test-up-local-change.out@af4848f83e68 (annotated)

331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	1	+ mkdir r1
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	2	+ cd r1
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	3	+ hg init
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	4	+ echo a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	5	+ hg addremove
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	6	+ hg commit -t 1 -u test -d '0 0'
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	7	+ cd ..
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	8	+ mkdir r2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	9	+ cd r2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	10	+ hg init ../r1
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	11	+ hg up
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	12	+ echo abc
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	13	+ hg diff
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	14	+ sed 's/\(\(---\\|+++\).\)\t./\1/'
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 388 diff changeset	15	diff -r c19d34741b0a a
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	16	--- a/a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	17	+++ b/a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	18	@@ -1,1 +1,1 @@
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	19	-a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	20	+abc
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	21	+ cd ../r1
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	22	+ echo b
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	23	+ echo a2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	24	+ hg addremove
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	25	+ hg commit -t 2 -u test -d '0 0'
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	26	+ cd ../r2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	27	+ hg -q pull ../r1
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	28	+ hg status
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	29	C a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	30	+ hg -d up
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	31	resolving manifests
374 f07d00fcd281 update tests to reflect new short hash length mpm@selenic.com parents: 350 diff changeset	32	ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	33	a versions differ, resolve
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	34	remote created b
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	35	getting b
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	36	merging a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	37	resolving a
374 f07d00fcd281 update tests to reflect new short hash length mpm@selenic.com parents: 350 diff changeset	38	file a: other d730145abbf9 ancestor b789fdd96dc2
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	39	+ hg -d up -m
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	40	resolving manifests
374 f07d00fcd281 update tests to reflect new short hash length mpm@selenic.com parents: 350 diff changeset	41	ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	42	+ hg parents
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	43	changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
388 398737777644 Fixed tests for displaying tags in hg history and hg parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 382 diff changeset	44	tag: tip
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	45	user: test
382 37249c522770 test suite: fix timezone problems and port collision problem mpm@selenic.com parents: 377 diff changeset	46	date: Thu Jan 1 00:00:00 1970
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	47	summary: 2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	48
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	49	+ hg -v history
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	50	changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
388 398737777644 Fixed tests for displaying tags in hg history and hg parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 382 diff changeset	51	tag: tip
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	52	manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	53	user: test
382 37249c522770 test suite: fix timezone problems and port collision problem mpm@selenic.com parents: 377 diff changeset	54	date: Thu Jan 1 00:00:00 1970
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	55	files: a b
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	56	description:
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	57	2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	58
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	59	changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	60	manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	61	user: test
382 37249c522770 test suite: fix timezone problems and port collision problem mpm@selenic.com parents: 377 diff changeset	62	date: Thu Jan 1 00:00:00 1970
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	63	files: a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	64	description:
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	65	1
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	66
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	67	+ hg diff
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	68	+ sed 's/\(\(---\\|+++\).\)\t./\1/'
396 8f8bb77d560e Show revisions in diffs like CVS, based on a patch from Goffredo Baroncelli. Thomas Arendsen Hein <thomas@intevation.de> parents: 388 diff changeset	69	diff -r 1e71731e6fbb a
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	70	--- a/a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	71	+++ b/a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	72	@@ -1,1 +1,1 @@
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	73	-a2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	74	+abc

author	mpm@selenic.com
	Tue, 21 Jun 2005 17:47:28 -0800
changeset 401	af4848f83e68
parent 396	8f8bb77d560e
child 485	c5705ab9cebd
permissions	-rw-r--r--