mercurial: tests/test-up-local-change.out@a6e2e60b34d0 (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
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	18	resolving manifests
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	19	overwrite False partial False
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	20	ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
6283 5a45c82fc7da Revert cfebb175704f, fixing the output of 2 tests Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6279 diff changeset	21	searching for copies back to rev 1
5371 17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 3592 diff changeset	22	unmatched files in other:
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 3592 diff changeset	23	b
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
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 5863 diff changeset	26	picked tool 'true' for a (binary False symlink False)
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	27	merging a
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	28	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	29	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	30	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	31	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	32	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	33	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	34	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	35	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	36
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	37	resolving manifests
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	38	overwrite False partial False
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	39	ancestor 33aaa84a386b local 802f095af299+ remote 33aaa84a386b
3121 2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	40	b: remote deleted -> r
1674 dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	41	removing 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	42	0 files updated, 0 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	43	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	44	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	45	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	46	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	47
2915 013921c753bd merge with other head by default, not tip. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	48	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	49	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	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
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	55	resolving manifests
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	56	overwrite False partial False
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	57	ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
6283 5a45c82fc7da Revert cfebb175704f, fixing the output of 2 tests Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 6279 diff changeset	58	searching for copies back to rev 1
5371 17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 3592 diff changeset	59	unmatched files in other:
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 3592 diff changeset	60	b
3121 2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	61	a: versions differ -> m
2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	62	b: remote created -> g
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 5863 diff changeset	63	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	64	merging a
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	65	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	66	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	67	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	68	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	69	tag: tip
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	70	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	71	date: Mon Jan 12 13:46:40 1970 +0000
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	72	summary: 2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	73
2966 fb493241d7f6 Only show long hashes with --debug, not --verbose Matt Mackall <mpm@selenic.com> parents: 2956 diff changeset	74	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	75	tag: tip
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	76	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	77	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	78	files: a b
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	79	description:
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	80	2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	81
546 c8ae964109c1 Add an empty line after description in verbose mode of show_changeset. Thomas Arendsen Hein <thomas@intevation.de> parents: 495 diff changeset	82
2966 fb493241d7f6 Only show long hashes with --debug, not --verbose Matt Mackall <mpm@selenic.com> parents: 2956 diff changeset	83	changeset: 0:33aaa84a386b
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
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	1
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
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	91	diff -r 802f095af299 a
768 20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	92	--- a/a
20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	93	+++ b/a
5863 3d1f9dcecdea diff: don't show function name by default Matt Mackall <mpm@selenic.com> parents: 5371 diff changeset	94	@@ -1,1 +1,1 @@
768 20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	95	-a2
20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	96	+abc
2175 b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2065 diff changeset	97	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	98	adding b
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6283 diff changeset	99	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	100	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	101	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	102	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	103	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	104	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	105
6375 cdc458b12f0f update: better logic and messages for updates Matt Mackall <mpm@selenic.com> parents: 6338 diff changeset	106	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	107	failed
1995 2da2d46862fb Spelling fix: "commited" -> "committed" mcmillen@cs.cmu.edu parents: 1933 diff changeset	108	abort: outstanding uncommitted 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	109	failed
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	110	resolving manifests
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	111	overwrite False partial False
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	112	ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d
5371 17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 3592 diff changeset	113	searching for copies back to rev 1
3121 2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	114	a: versions differ -> m
2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	115	b: versions differ -> m
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 5863 diff changeset	116	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	117	merging a
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	118	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	119	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	120	merging b
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	121	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	122	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	123	(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	124	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	125	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	126	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	127	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	128
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	129	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	130	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	131	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	132	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	133	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	134	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	135
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	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	137	--- 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	138	+++ b/a
5863 3d1f9dcecdea diff: don't show function name by default Matt Mackall <mpm@selenic.com> parents: 5371 diff changeset	139	@@ -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	140	-a2
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	141	+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	142	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	143	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	144	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	145	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	146	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	147	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	148	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	149	1 files updated, 0 files merged, 0 files removed, 0 files unresolved

author	Patrick Mezard <pmezard@gmail.com>
	Mon, 14 Apr 2008 22:31:34 +0200
changeset 6543	a6e2e60b34d0
parent 6375	cdc458b12f0f
child 6512	368a4ec603cc
permissions	-rw-r--r--