mercurial: tests/test-up-local-change.out@20e95c245bc3 (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
767 61ed30e82b27 Update tests to match new addremove chattiness. Bryan O'Sullivan <bos@serpentine.com> parents: 749 diff changeset	6	adding a
749 7e4843b7efd2 Update tests to use commit -m and default -u mpm@selenic.com parents: 748 diff changeset	7	+ hg commit -m 1 -d '0 0'
485 c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 396 diff changeset	8	+ hg clone . ../r2
c5705ab9cebd [PATCH] add clone command mpm@selenic.com parents: 396 diff changeset	9	+ cd ../r2
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	10	+ hg up
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	11	+ echo abc
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	12	+ hg diff
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	13	+ 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	14	diff -r c19d34741b0a a
331 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
767 61ed30e82b27 Update tests to match new addremove chattiness. Bryan O'Sullivan <bos@serpentine.com> parents: 749 diff changeset	24	adding b
749 7e4843b7efd2 Update tests to use commit -m and default -u mpm@selenic.com parents: 748 diff changeset	25	+ hg commit -m 2 -d '0 0'
331 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
748 c5df1a9c5276 Update test output for status change mpm@selenic.com parents: 705 diff changeset	29	M a
591 eb46971fc57f options: kill -d for debug mpm@selenic.com parents: 547 diff changeset	30	+ hg --debug up
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	31	resolving manifests
677 204328d345f1 Fix up test for update flags Matt Mackall <mpm@selenic.com> parents: 676 diff changeset	32	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	33	ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	34	a versions differ, resolve
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	35	remote created b
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	36	getting b
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	37	merging a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	38	resolving a
374 f07d00fcd281 update tests to reflect new short hash length mpm@selenic.com parents: 350 diff changeset	39	file a: other d730145abbf9 ancestor b789fdd96dc2
591 eb46971fc57f options: kill -d for debug mpm@selenic.com parents: 547 diff changeset	40	+ hg --debug up -m
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	41	resolving manifests
677 204328d345f1 Fix up test for update flags Matt Mackall <mpm@selenic.com> parents: 676 diff changeset	42	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	43	ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	44	+ hg parents
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	45	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	46	tag: tip
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	47	user: test
382 37249c522770 test suite: fix timezone problems and port collision problem mpm@selenic.com parents: 377 diff changeset	48	date: Thu Jan 1 00:00:00 1970
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	49	summary: 2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	50
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	51	+ hg -v history
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	52	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	53	tag: tip
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	54	manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	55	user: test
382 37249c522770 test suite: fix timezone problems and port collision problem mpm@selenic.com parents: 377 diff changeset	56	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	57	files: a b
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	58	description:
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	59	2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	60
546 c8ae964109c1 Add an empty line after description in verbose mode of show_changeset. Thomas Arendsen Hein <thomas@intevation.de> parents: 495 diff changeset	61
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	62	changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	63	manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	64	user: test
382 37249c522770 test suite: fix timezone problems and port collision problem mpm@selenic.com parents: 377 diff changeset	65	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	66	files: a
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	67	description:
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	68	1
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	69
546 c8ae964109c1 Add an empty line after description in verbose mode of show_changeset. Thomas Arendsen Hein <thomas@intevation.de> parents: 495 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/'
768 20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	73	diff -r 1e71731e6fbb a
20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	74	--- a/a
20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	75	+++ b/a
20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	76	@@ -1,1 +1,1 @@
20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	77	-a2
20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	78	+abc

author	mpm@selenic.com
	Sat, 23 Jul 2005 10:00:56 -0500
changeset 768	20e95c245bc3
parent 767	61ed30e82b27
child 775	122449dd89db
child 793	445970ccf57a
permissions	-rw-r--r--