mercurial-crew-with-dirclash: tests/test-up-local-change.out@398737777644 (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/'
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	15	--- a/a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	16	+++ b/a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	17	@@ -1,1 +1,1 @@
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	18	-a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	19	+abc
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	20	+ cd ../r1
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	21	+ echo b
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	22	+ echo a2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	23	+ hg addremove
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	24	+ hg commit -t 2 -u test -d '0 0'
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	25	+ cd ../r2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	26	+ hg -q pull ../r1
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	27	+ hg status
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	28	C a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	29	+ hg -d up
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	30	resolving manifests
374 f07d00fcd281 update tests to reflect new short hash length mpm@selenic.com parents: 350 diff changeset	31	ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	32	a versions differ, resolve
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	33	remote created b
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	34	getting b
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	35	merging a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	36	resolving a
374 f07d00fcd281 update tests to reflect new short hash length mpm@selenic.com parents: 350 diff changeset	37	file a: other d730145abbf9 ancestor b789fdd96dc2
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	38	+ hg -d up -m
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	39	resolving manifests
374 f07d00fcd281 update tests to reflect new short hash length mpm@selenic.com parents: 350 diff changeset	40	ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	41	+ hg parents
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	42	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	43	tag: tip
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	44	user: test
382 37249c522770 test suite: fix timezone problems and port collision problem mpm@selenic.com parents: 377 diff changeset	45	date: Thu Jan 1 00:00:00 1970
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	46	summary: 2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	47
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	48	+ hg -v history
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	49	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	50	tag: tip
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	51	manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	52	user: test
382 37249c522770 test suite: fix timezone problems and port collision problem mpm@selenic.com parents: 377 diff changeset	53	date: Thu Jan 1 00:00:00 1970
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	54	files: a b
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	55	description:
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	56	2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	57
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	58	changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	59	manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	60	user: test
382 37249c522770 test suite: fix timezone problems and port collision problem mpm@selenic.com parents: 377 diff changeset	61	date: Thu Jan 1 00:00:00 1970
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	62	files: a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	63	description:
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	64	1
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	65
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	66	+ hg diff
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	67	+ sed 's/\(\(---\\|+++\).\)\t./\1/'
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	68	--- a/a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	69	+++ b/a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	70	@@ -1,1 +1,1 @@
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	71	-a2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	72	+abc

author	Thomas Arendsen Hein <thomas@intevation.de>
	Fri, 17 Jun 2005 11:03:03 +0100
changeset 388	398737777644
parent 382	37249c522770
child 396	8f8bb77d560e
permissions	-rw-r--r--