mercurial: tests/test-up-local-change.out@4ccf3de52989 (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'
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 396 diff changeset	7	+ hg clone . ../r2
c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 396 diff changeset	8	+ cd ../r2
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	9	+ hg up
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	10	+ echo abc
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	11	+ hg diff
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	12	+ 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	13	diff -r c19d34741b0a a
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	14	--- a/a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	15	+++ b/a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	16	@@ -1,1 +1,1 @@
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	17	-a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	18	+abc
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	19	+ cd ../r1
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	20	+ echo b
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	21	+ echo a2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	22	+ hg addremove
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	23	+ hg commit -t 2 -u test -d '0 0'
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
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	27	C a
591 eb46971fc57f options: kill -d for debug mpm@selenic.com parents: 547 diff changeset	28	+ hg --debug up
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	29	resolving manifests
677 204328d345f1 Fix up test for update flags Matt Mackall <mpm@selenic.com> parents: 676 diff changeset	30	force None allow None moddirstate True linear True
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
591 eb46971fc57f options: kill -d for debug mpm@selenic.com parents: 547 diff changeset	38	+ hg --debug up -m
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	39	resolving manifests
677 204328d345f1 Fix up test for update flags Matt Mackall <mpm@selenic.com> parents: 676 diff changeset	40	force None allow 1 moddirstate True linear True
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
494 6020bde714e4 Fixed test for previous change of 'hg -v history'. Thomas Arendsen Hein <thomas@intevation.de> parents: 490 diff changeset	55	files: a b
331 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
546 c8ae964109c1 Add an empty line after description in verbose mode of show_changeset. Thomas Arendsen Hein <thomas@intevation.de> parents: 495 diff changeset	59
619 d96c1153b25d update tests Matt Mackall <mpm@selenic.com> parents: 591 diff changeset	60
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	61	changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	62	manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	63	user: test
382 37249c522770 test suite: fix timezone problems and port collision problem mpm@selenic.com parents: 377 diff changeset	64	date: Thu Jan 1 00:00:00 1970
494 6020bde714e4 Fixed test for previous change of 'hg -v history'. Thomas Arendsen Hein <thomas@intevation.de> parents: 490 diff changeset	65	files: a
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	66	description:
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	67	1
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	68
546 c8ae964109c1 Add an empty line after description in verbose mode of show_changeset. Thomas Arendsen Hein <thomas@intevation.de> parents: 495 diff changeset	69
619 d96c1153b25d update tests Matt Mackall <mpm@selenic.com> parents: 591 diff changeset	70
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	71	+ hg diff
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	72	+ 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	73	diff -r 1e71731e6fbb a
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	74	--- a/a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	75	+++ b/a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	76	@@ -1,1 +1,1 @@
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	77	-a2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	78	+abc

author	Matt Mackall <mpm@selenic.com>
	Mon, 11 Jul 2005 21:56:29 -0800
changeset 684	4ccf3de52989
parent 677	204328d345f1
child 696	b266e92bcd0b
child 705	574869103985
permissions	-rw-r--r--