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

767 61ed30e82b27 Update tests to match new addremove chattiness. Bryan O'Sullivan <bos@serpentine.com> parents: 749 diff changeset	1	adding a
2175 b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2065 diff changeset	2	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	3	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	4	diff -r 33aaa84a386b a
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	5	--- a/a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	6	+++ b/a
5863 3d1f9dcecdea diff: don't show function name by default Matt Mackall <mpm@selenic.com> parents: 5371 diff changeset	7	@@ -1,1 +1,1 @@
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	8	-a
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	9	+abc
767 61ed30e82b27 Update tests to match new addremove chattiness. Bryan O'Sullivan <bos@serpentine.com> parents: 749 diff changeset	10	adding b
748 c5df1a9c5276 Update test output for status change mpm@selenic.com parents: 705 diff changeset	11	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	12	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	13	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	14	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	15	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	16
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	17	resolving manifests
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	18	overwrite False partial False
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	19	ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
5371 17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 3592 diff changeset	20	searching for copies back to rev 1
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 3592 diff changeset	21	unmatched files in other:
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 3592 diff changeset	22	b
3121 2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	23	a: versions differ -> m
2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	24	b: remote created -> g
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 5863 diff changeset	25	picked tool 'true' for a (binary False symlink False)
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	26	merging a
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	27	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	28	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	29	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	30	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	31	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	32	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	33	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	34	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	35
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	36	resolving manifests
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	37	overwrite False partial False
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	38	ancestor 33aaa84a386b local 802f095af299+ remote 33aaa84a386b
3121 2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	39	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	40	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	41	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	42	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	43	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	44	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	45	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	46
2915 013921c753bd merge with other head by default, not tip. Vadim Gelfer <vadim.gelfer@gmail.com> parents: 2830 diff changeset	47	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	48	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	49	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	50	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	51	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	52	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	53
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	54	resolving manifests
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	55	overwrite False partial False
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	56	ancestor 33aaa84a386b local 33aaa84a386b+ remote 802f095af299
5371 17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 3592 diff changeset	57	searching for copies back to rev 1
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 3592 diff changeset	58	unmatched files in other:
17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 3592 diff changeset	59	b
3121 2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	60	a: versions differ -> m
2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	61	b: remote created -> g
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 5863 diff changeset	62	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	63	merging a
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	64	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	65	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	66	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	67	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	68	tag: tip
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	69	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	70	date: Mon Jan 12 13:46:40 1970 +0000
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	71	summary: 2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	72
2966 fb493241d7f6 Only show long hashes with --debug, not --verbose Matt Mackall <mpm@selenic.com> parents: 2956 diff changeset	73	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	74	tag: tip
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	75	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	76	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	77	files: a b
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	78	description:
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	79	2
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	80
546 c8ae964109c1 Add an empty line after description in verbose mode of show_changeset. Thomas Arendsen Hein <thomas@intevation.de> parents: 495 diff changeset	81
2966 fb493241d7f6 Only show long hashes with --debug, not --verbose Matt Mackall <mpm@selenic.com> parents: 2956 diff changeset	82	changeset: 0:33aaa84a386b
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	83	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	84	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	85	files: a
331 55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	86	description:
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	87	1
55f63f3b6a54 Add a simple testing framework mpm@selenic.com parents: diff changeset	88
546 c8ae964109c1 Add an empty line after description in verbose mode of show_changeset. Thomas Arendsen Hein <thomas@intevation.de> parents: 495 diff changeset	89
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	90	diff -r 802f095af299 a
768 20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	91	--- a/a
20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	92	+++ b/a
5863 3d1f9dcecdea diff: don't show function name by default Matt Mackall <mpm@selenic.com> parents: 5371 diff changeset	93	@@ -1,1 +1,1 @@
768 20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	94	-a2
20e95c245bc3 Fix local file changes being ignored after non-branch merge mpm@selenic.com parents: 767 diff changeset	95	+abc
2175 b2ae81a7df29 Make hg update more verbose by default (issue12) Thomas Arendsen Hein <thomas@intevation.de> parents: 2065 diff changeset	96	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	97	adding b
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	98	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	99	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	100	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	101	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	102	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	103
3592 fffc8a733bf9 Backed out changeset 41989e55fa375de4376e7e64b17e38312e8ec140 Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 3580 diff changeset	104	abort: update spans branches, use 'hg merge' or 'hg update -C' to lose 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	105	failed
1995 2da2d46862fb Spelling fix: "commited" -> "committed" mcmillen@cs.cmu.edu parents: 1933 diff changeset	106	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	107	failed
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	108	resolving manifests
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	109	overwrite False partial False
b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	110	ancestor 33aaa84a386b local 802f095af299+ remote 030602aee63d
5371 17ed9b9a0d03 merge: add debug diagnostics for findcopies Matt Mackall <mpm@selenic.com> parents: 3592 diff changeset	111	searching for copies back to rev 1
3121 2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	112	a: versions differ -> m
2ef0b3aae186 merge: simplify actions with helper function Matt Mackall <mpm@selenic.com> parents: 3120 diff changeset	113	b: versions differ -> m
6004 5af5f0f9d724 merge: allow smarter tool configuration Matt Mackall <mpm@selenic.com> parents: 5863 diff changeset	114	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	115	merging a
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	116	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	117	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	118	merging b
3314 b16456909a0a merge: various tidying Matt Mackall <mpm@selenic.com> parents: 3311 diff changeset	119	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	120	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	121	(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	122	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	123	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	124	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	125	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	126
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	127	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	128	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	129	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	130	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	131	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	132	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	133
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	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	135	--- 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	136	+++ b/a
5863 3d1f9dcecdea diff: don't show function name by default Matt Mackall <mpm@selenic.com> parents: 5371 diff changeset	137	@@ -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	138	-a2
dee55c4a4963 abort when using 'update -m' and this is not a merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 1637 diff changeset	139	+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	140	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	141	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	142	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	143	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	144	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	145	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	146	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	147	1 files updated, 0 files merged, 0 files removed, 0 files unresolved

author	Alexis S. L. Carvalho <alexis@cecm.usp.br>
	Thu, 14 Feb 2008 18:08:16 -0200
changeset 6108	5086576a2152
parent 6004	5af5f0f9d724
child 6279	c50ac875ffcb
permissions	-rw-r--r--