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

767 61ed30e82b27 Update tests to match new addremove chattiness. Bryan O'Sullivan <bos@serpentine.com> parents: 749 diff changeset	1	adding a
6338 0750f11152fe clone: print "updating working directory" status message Adrian Buehlmann <adrian@cadifra.com> parents: 6336 diff changeset	2	updating working directory
2175 b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2065 diff changeset	3	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2065 diff changeset	4	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	5	diff -r 33aaa84a386b a
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	6	--- a/a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	7	+++ b/a
5863 3d1f9dcecdea diff: don't show function name by default Matt Mackall <mpm@selenic.com> parents: 5371 diff changeset	8	@@ -1,1 +1,1 @@
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	9	-a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	10	+abc
767 61ed30e82b27 Update tests to match new addremove chattiness. Bryan O'Sullivan <bos@serpentine.com> parents: 749 diff changeset	11	adding b
748 c5df1a9c5276 Update test output for status change mpm@selenic.com parents: 705 diff changeset	12	M a
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	13	changeset: 0:33aaa84a386b
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	14	user: test
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	15	date: Mon Jan 12 13:46:40 1970 +0000
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	16	summary: 1
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	17
8753 af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8742 diff changeset	18	searching for copies back to rev 1
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8742 diff changeset	19	unmatched files in other:
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8742 diff changeset	20	b
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	21	resolving manifests
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	22	overwrite False partial False
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	23	ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
3121 2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	24	a: versions differ -> m
2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	25	b: remote created -> g
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6375 diff changeset	26	preserving a for resolve of a
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 5863 diff changeset	27	picked tool 'true' for a (binary False symlink False)
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	28	merging a
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	29	my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b
2977 87a0332ab58b merge: combine merge and get lists Matt Mackall <mpm@selenic.com> parents: 2973 diff changeset	30	getting b
1922 6d50d6189269 ui: output the number of file updated/merged/removed/... on update Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1674 diff changeset	31	1 files updated, 1 files merged, 0 files removed, 0 files unresolved
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	32	changeset: 1:802f095af299
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	33	tag: tip
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	34	user: test
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	35	date: Mon Jan 12 13:46:40 1970 +0000
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	36	summary: 2
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	37
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	38	resolving manifests
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	39	overwrite False partial False
8753 af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8742 diff changeset	40	ancestor 802f095af299 local 802f095af299+ remote 33aaa84a386b
8742 a964ab624385 merge: allow merging going backwards Matt Mackall <mpm@selenic.com> parents: 8734 diff changeset	41	a: versions differ -> m
8734 60fa3371aa75 merge: pretend ancestor is local to simplify backwards and overwrite Matt Mackall <mpm@selenic.com> parents: 8545 diff changeset	42	b: other deleted -> r
8742 a964ab624385 merge: allow merging going backwards Matt Mackall <mpm@selenic.com> parents: 8734 diff changeset	43	preserving a for resolve of a
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	44	removing b
8742 a964ab624385 merge: allow merging going backwards Matt Mackall <mpm@selenic.com> parents: 8734 diff changeset	45	picked tool 'true' for a (binary False symlink False)
a964ab624385 merge: allow merging going backwards Matt Mackall <mpm@selenic.com> parents: 8734 diff changeset	46	merging a
a964ab624385 merge: allow merging going backwards Matt Mackall <mpm@selenic.com> parents: 8734 diff changeset	47	my a@802f095af299+ other a@33aaa84a386b ancestor a@33aaa84a386b
a964ab624385 merge: allow merging going backwards Matt Mackall <mpm@selenic.com> parents: 8734 diff changeset	48	premerge successful
a964ab624385 merge: allow merging going backwards Matt Mackall <mpm@selenic.com> parents: 8734 diff changeset	49	0 files updated, 1 files merged, 1 files removed, 0 files unresolved
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	50	changeset: 0:33aaa84a386b
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	51	user: test
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	52	date: Mon Jan 12 13:46:40 1970 +0000
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	53	summary: 1
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	54
2915 013921c753bd merge with other head by default, not tip. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	55	abort: there is nothing to merge - use "hg update" instead
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	56	failed
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	57	changeset: 0:33aaa84a386b
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	58	user: test
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	59	date: Mon Jan 12 13:46:40 1970 +0000
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	60	summary: 1
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	61
8753 af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8742 diff changeset	62	searching for copies back to rev 1
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8742 diff changeset	63	unmatched files in other:
af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8742 diff changeset	64	b
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	65	resolving manifests
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	66	overwrite False partial False
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	67	ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
3121 2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	68	a: versions differ -> m
2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	69	b: remote created -> g
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6375 diff changeset	70	preserving a for resolve of a
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 5863 diff changeset	71	picked tool 'true' for a (binary False symlink False)
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	72	merging a
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	73	my a@33aaa84a386b+ other a@802f095af299 ancestor a@33aaa84a386b
2977 87a0332ab58b merge: combine merge and get lists Matt Mackall <mpm@selenic.com> parents: 2973 diff changeset	74	getting b
1922 6d50d6189269 ui: output the number of file updated/merged/removed/... on update Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1674 diff changeset	75	1 files updated, 1 files merged, 0 files removed, 0 files unresolved
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	76	changeset: 1:802f095af299
388 398737777644 Fixed tests for displaying tags in hg history and hg parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 382 diff changeset	77	tag: tip
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	78	user: test
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	79	date: Mon Jan 12 13:46:40 1970 +0000
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	80	summary: 2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	81
2966 fb493241d7f6 Only show long hashes with --debug, not --verbose Matt Mackall <mpm@selenic.com> parents: 2956 diff changeset	82	changeset: 1:802f095af299
388 398737777644 Fixed tests for displaying tags in hg history and hg parents. Thomas Arendsen Hein <thomas@intevation.de> parents: 382 diff changeset	83	tag: tip
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	84	user: test
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	85	date: Mon Jan 12 13:46:40 1970 +0000
494 6020bde714e4 Fixed test for previous change of 'hg -v history'. Thomas Arendsen Hein <thomas@intevation.de> parents: 490 diff changeset	86	files: a b
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	87	description:
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	88	2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	89
546 c8ae964109c1 Add an empty line after description in verbose mode of show_changeset. Thomas Arendsen Hein <thomas@intevation.de> parents: 495 diff changeset	90
2966 fb493241d7f6 Only show long hashes with --debug, not --verbose Matt Mackall <mpm@selenic.com> parents: 2956 diff changeset	91	changeset: 0:33aaa84a386b
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	92	user: test
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	93	date: Mon Jan 12 13:46:40 1970 +0000
494 6020bde714e4 Fixed test for previous change of 'hg -v history'. Thomas Arendsen Hein <thomas@intevation.de> parents: 490 diff changeset	94	files: a
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	95	description:
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	96	1
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	97
546 c8ae964109c1 Add an empty line after description in verbose mode of show_changeset. Thomas Arendsen Hein <thomas@intevation.de> parents: 495 diff changeset	98
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	99	diff -r 802f095af299 a
768 20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	100	--- a/a
20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	101	+++ b/a
5863 3d1f9dcecdea diff: don't show function name by default Matt Mackall <mpm@selenic.com> parents: 5371 diff changeset	102	@@ -1,1 +1,1 @@
768 20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	103	-a2
20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	104	+abc
2175 b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2065 diff changeset	105	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	106	adding b
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6283 diff changeset	107	created new head
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	108	M a
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	109	changeset: 1:802f095af299
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	110	user: test
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	111	date: Mon Jan 12 13:46:40 1970 +0000
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	112	summary: 2
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	113
6375 cdc458b12f0f update: better logic and messages for updates Matt Mackall <mpm@selenic.com> parents: 6338 diff changeset	114	abort: crosses branches (use 'hg merge' or 'hg update -C' to discard changes)
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	115	failed
8545 3682a19bb637 merge: give hint as to how to discover uncommitted changes Steve Borho <steve@borho.org> parents: 6512 diff changeset	116	abort: outstanding uncommitted changes (use 'hg status' to list changes)
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	117	failed
8753 af5f099d932b merge: refactor manifestmerge init to better report effective ancestor Matt Mackall <mpm@selenic.com> parents: 8742 diff changeset	118	searching for copies back to rev 1
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	119	resolving manifests
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	120	overwrite False partial False
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	121	ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d
3121 2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	122	a: versions differ -> m
2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	123	b: versions differ -> m
6512 368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6375 diff changeset	124	preserving a for resolve of a
368a4ec603cc merge: introduce mergestate Matt Mackall <mpm@selenic.com> parents: 6375 diff changeset	125	preserving b for resolve of b
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 5863 diff changeset	126	picked tool 'true' for a (binary False symlink False)
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	127	merging a
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	128	my a@802f095af299+ other a@030602aee63d ancestor a@33aaa84a386b
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 5863 diff changeset	129	picked tool 'true' for b (binary False symlink False)
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	130	merging b
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	131	my b@802f095af299+ other b@030602aee63d ancestor b@000000000000
1922 6d50d6189269 ui: output the number of file updated/merged/removed/... on update Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1674 diff changeset	132	0 files updated, 2 files merged, 0 files removed, 0 files unresolved
6d50d6189269 ui: output the number of file updated/merged/removed/... on update Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1674 diff changeset	133	(branch merge, don't forget to commit)
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	134	changeset: 1:802f095af299
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	135	user: test
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	136	date: Mon Jan 12 13:46:40 1970 +0000
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	137	summary: 2
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	138
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	139	changeset: 2:030602aee63d
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	140	tag: tip
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	141	parent: 0:33aaa84a386b
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	142	user: test
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	143	date: Mon Jan 12 13:46:40 1970 +0000
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	144	summary: 3
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	145
1933 7544700fd931 Use 'hg ci -d "1000000 0"' in tests to circumvent problem with leading zero. Thomas Arendsen Hein <thomas@intevation.de> parents: 1922 diff changeset	146	diff -r 802f095af299 a
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	147	--- a/a
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	148	+++ b/a
5863 3d1f9dcecdea diff: don't show function name by default Matt Mackall <mpm@selenic.com> parents: 5371 diff changeset	149	@@ -1,1 +1,1 @@
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	150	-a2
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	151	+abc
2065 2ff37e3bf780 fix update when a locally added file match the target revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2038 diff changeset	152	adding a
2ff37e3bf780 fix update when a locally added file match the target revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2038 diff changeset	153	pulling from ../a
2ff37e3bf780 fix update when a locally added file match the target revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2038 diff changeset	154	requesting all changes
2ff37e3bf780 fix update when a locally added file match the target revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2038 diff changeset	155	adding changesets
2ff37e3bf780 fix update when a locally added file match the target revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2038 diff changeset	156	adding manifests
2ff37e3bf780 fix update when a locally added file match the target revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2038 diff changeset	157	adding file changes
2ff37e3bf780 fix update when a locally added file match the target revision Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 2038 diff changeset	158	added 1 changesets with 1 changes to 1 files
3400 d2b55e3c4e25 merge: if filemerge skips merge, report as updated Matt Mackall <mpm@selenic.com> parents: 3314 diff changeset	159	1 files updated, 0 files merged, 0 files removed, 0 files unresolved

author	Patrick Mezard <pmezard@gmail.com>
	Sun, 23 Aug 2009 13:03:10 +0200
changeset 9385	570416319ed3
parent 8753	af5f099d932b
child 9611	a3d73b3e1f8a
permissions	-rw-r--r--