Mercurial: tests/test-up-local-change.out@f49f602fae92 (annotated)

767 61ed30e82b27 Update tests to match new addremove chattiness. Bryan O'Sullivan <bos@serpentine.com> parents: 749 diff changeset	1	adding a
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	2	diff -r c19d34741b0a a
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	3	--- a/a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	4	+++ b/a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	5	@@ -1,1 +1,1 @@
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	6	-a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	7	+abc
767 61ed30e82b27 Update tests to match new addremove chattiness. Bryan O'Sullivan <bos@serpentine.com> parents: 749 diff changeset	8	adding b
748 c5df1a9c5276 Update test output for status change mpm@selenic.com parents: 705 diff changeset	9	M a
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	10	resolving manifests
677 204328d345f1 Fix up test for update flags Matt Mackall <mpm@selenic.com> parents: 676 diff changeset	11	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	12	ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	13	a versions differ, resolve
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	14	remote created b
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	15	getting b
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	16	merging a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	17	resolving a
1351 0e2be889ccd7 Repair ancestor logic, fix up test cases Matt Mackall <mpm@selenic.com> parents: 981 diff changeset	18	file a: my b789fdd96dc2 other d730145abbf9 ancestor b789fdd96dc2
1581 db10b7114de0 abort when merging two heads and repository has local changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1351 diff changeset	19	abort: outstanding uncommited changes
db10b7114de0 abort when merging two heads and repository has local changes Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1351 diff changeset	20	failed
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	21	resolving manifests
677 204328d345f1 Fix up test for update flags Matt Mackall <mpm@selenic.com> parents: 676 diff changeset	22	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	23	ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
784 853bfbf1a312 Fix tests for short changeset hashes and hidden manifest hashes mpm@selenic.com parents: 775 diff changeset	24	changeset: 1:1e71731e6fbb
388 398737777644 Fixed tests for displaying tags in hg history and hg parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 382 diff changeset	25	tag: tip
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	26	user: test
967 1f3710636b45 [PATCH] Print timezone offset when outputting dates Samuel Tardieu <sam@rfc1149.net> parents: 925 diff changeset	27	date: Thu Jan 1 00:00:00 1970 +0000
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	28	summary: 2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	29
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	30	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	31	tag: tip
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	32	user: test
967 1f3710636b45 [PATCH] Print timezone offset when outputting dates Samuel Tardieu <sam@rfc1149.net> parents: 925 diff changeset	33	date: Thu Jan 1 00:00:00 1970 +0000
494 6020bde714e4 Fixed test for previous change of 'hg -v history'. Thomas Arendsen Hein <thomas@intevation.de> parents: 490 diff changeset	34	files: a b
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	35	description:
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	36	2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	37
546 c8ae964109c1 Add an empty line after description in verbose mode of show_changeset. Thomas Arendsen Hein <thomas@intevation.de> parents: 495 diff changeset	38
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	39	changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	40	user: test
967 1f3710636b45 [PATCH] Print timezone offset when outputting dates Samuel Tardieu <sam@rfc1149.net> parents: 925 diff changeset	41	date: Thu Jan 1 00:00:00 1970 +0000
494 6020bde714e4 Fixed test for previous change of 'hg -v history'. Thomas Arendsen Hein <thomas@intevation.de> parents: 490 diff changeset	42	files: a
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	43	description:
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	44	1
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	45
546 c8ae964109c1 Add an empty line after description in verbose mode of show_changeset. Thomas Arendsen Hein <thomas@intevation.de> parents: 495 diff changeset	46
768 20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	47	diff -r 1e71731e6fbb a
20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	48	--- a/a
20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	49	+++ b/a
20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	50	@@ -1,1 +1,1 @@
20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	51	-a2
20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	52	+abc

author	Robin Farine <robin.farine@terminus.org>
	Tue, 24 Jan 2006 13:59:01 +1300
changeset 1634	f49f602fae92
parent 1581	db10b7114de0
child 1637	3b1b44b917f4
permissions	-rw-r--r--