Mercurial: tests/test-newbranch.out@e5c79e31feb6 (annotated)

4602 d9d177ef748a Fix up tests for new branch message Brendan Cully <brendan@kublai.com> parents: 4410 diff changeset	1	marked working directory as branch foo
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3451 diff changeset	2	foo
4602 d9d177ef748a Fix up tests for new branch message Brendan Cully <brendan@kublai.com> parents: 4410 diff changeset	3	marked working directory as branch bar
4203 aee3d312c32e Add test for branch shadowing Brendan Cully <brendan@kublai.com> parents: 4175 diff changeset	4	% branch shadowing
10596 7648f32713f2 branch: help misuse of hg branch to switch branches Yuya Nishihara <yuya@tcha.org> parents: 10355 diff changeset	5	abort: a branch of the same name already exists (use 'hg update' to switch to it)
4602 d9d177ef748a Fix up tests for new branch message Brendan Cully <brendan@kublai.com> parents: 4410 diff changeset	6	marked working directory as branch default
11317 b66e414d38b0 commit: fix display of 'created new head' message (issue2186) Gilles Moris <gilles.moris@free.fr> parents: 11181 diff changeset	7	created new head
8959 970506870efb Update test output for e67e5b60e55f Brendan Cully <brendan@kublai.com> parents: 7654 diff changeset	8	% there should be only one default branch head
970506870efb Update test output for e67e5b60e55f Brendan Cully <brendan@kublai.com> parents: 7654 diff changeset	9	changeset: 3:bf1bc2f45e83
970506870efb Update test output for e67e5b60e55f Brendan Cully <brendan@kublai.com> parents: 7654 diff changeset	10	tag: tip
970506870efb Update test output for e67e5b60e55f Brendan Cully <brendan@kublai.com> parents: 7654 diff changeset	11	user: test
970506870efb Update test output for e67e5b60e55f Brendan Cully <brendan@kublai.com> parents: 7654 diff changeset	12	date: Mon Jan 12 13:46:40 1970 +0000
970506870efb Update test output for e67e5b60e55f Brendan Cully <brendan@kublai.com> parents: 7654 diff changeset	13	summary: clear branch name
970506870efb Update test output for e67e5b60e55f Brendan Cully <brendan@kublai.com> parents: 7654 diff changeset	14
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	15	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	16	foo
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	17	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	18	(branch merge, don't forget to commit)
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	19	foo
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	20	changeset: 5:5f8fb06e083e
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	21	branch: foo
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	22	tag: tip
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	23	parent: 4:4909a3732169
aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	24	parent: 3:bf1bc2f45e83
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	25	user: test
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	26	date: Mon Jan 12 13:46:40 1970 +0000
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	27	summary: merge
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	28
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	29	changeset: 4:4909a3732169
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	30	branch: foo
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	31	parent: 1:b699b1cec9c2
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	32	user: test
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	33	date: Mon Jan 12 13:46:40 1970 +0000
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	34	summary: modify a branch
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	35
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	36	changeset: 3:bf1bc2f45e83
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	37	user: test
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	38	date: Mon Jan 12 13:46:40 1970 +0000
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	39	summary: clear branch name
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	40
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	41	changeset: 2:67ec16bde7f1
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	42	branch: bar
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	43	user: test
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	44	date: Mon Jan 12 13:46:40 1970 +0000
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	45	summary: change branch name
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	46
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	47	changeset: 1:b699b1cec9c2
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	48	branch: foo
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	49	user: test
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	50	date: Mon Jan 12 13:46:40 1970 +0000
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	51	summary: add branch name
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	52
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	53	changeset: 0:be8523e69bf8
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	54	user: test
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	55	date: Mon Jan 12 13:46:40 1970 +0000
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	56	summary: initial
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	57
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	58	foo 5:5f8fb06e083e
4675 6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches. Eric Hopper <hopper@omnifarious.org> parents: 4623 diff changeset	59	default 3:bf1bc2f45e83 (inactive)
6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches. Eric Hopper <hopper@omnifarious.org> parents: 4623 diff changeset	60	bar 2:67ec16bde7f1 (inactive)
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3451 diff changeset	61	foo
4176 f9bbcebcacea "default" is the default branch name Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4175 diff changeset	62	default
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3451 diff changeset	63	bar
3451 196baf20232b Add test for invalid branch cache (fixed by 27ebe4efe98e) Thomas Arendsen Hein <thomas@intevation.de> parents: 3420 diff changeset	64	% test for invalid branch cache
11175 39e7f14a8286 rollback: fix up tests Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	65	rolling back to revision 4 (undo commit)
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	66	changeset: 4:4909a3732169
3451 196baf20232b Add test for invalid branch cache (fixed by 27ebe4efe98e) Thomas Arendsen Hein <thomas@intevation.de> parents: 3420 diff changeset	67	branch: foo
196baf20232b Add test for invalid branch cache (fixed by 27ebe4efe98e) Thomas Arendsen Hein <thomas@intevation.de> parents: 3420 diff changeset	68	tag: tip
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	69	parent: 1:b699b1cec9c2
3451 196baf20232b Add test for invalid branch cache (fixed by 27ebe4efe98e) Thomas Arendsen Hein <thomas@intevation.de> parents: 3420 diff changeset	70	user: test
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	71	date: Mon Jan 12 13:46:40 1970 +0000
3451 196baf20232b Add test for invalid branch cache (fixed by 27ebe4efe98e) Thomas Arendsen Hein <thomas@intevation.de> parents: 3420 diff changeset	72	summary: modify a branch
196baf20232b Add test for invalid branch cache (fixed by 27ebe4efe98e) Thomas Arendsen Hein <thomas@intevation.de> parents: 3420 diff changeset	73
6056 0ad2ffbf6b38 Print less scary warning when invalidating the branch cache. Thomas Arendsen Hein <thomas@intevation.de> parents: 5988 diff changeset	74	invalidating branch cache (tip differs)
3761 9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	75	changeset: 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	76	branch: foo
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	77	tag: tip
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	78	parent: 1:b699b1cec9c2966b3700de4fef0dc123cd754c31
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	79	parent: -1:0000000000000000000000000000000000000000
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	80	manifest: 4:d01b250baaa05909152f7ae07d7a649deea0df9a
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	81	user: test
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	82	date: Mon Jan 12 13:46:40 1970 +0000
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	83	files: a
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	84	extra: branch=foo
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	85	description:
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	86	modify a branch
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	87
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	88
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	89	4:4909a3732169
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	90	4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4
4176 f9bbcebcacea "default" is the default branch name Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4175 diff changeset	91	bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default
3761 9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	92	4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	93	67ec16bde7f1575d523313b9bca000f6a6f12dca bar
5988 ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4675 diff changeset	94	% push should update the branch cache
ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4675 diff changeset	95	% pushing just rev 0
ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4675 diff changeset	96	be8523e69bf892e25817fc97187516b3c0804ae4 0
ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4675 diff changeset	97	be8523e69bf892e25817fc97187516b3c0804ae4 default
ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4675 diff changeset	98	% pushing everything
ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4675 diff changeset	99	4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4
ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4675 diff changeset	100	bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default
ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4675 diff changeset	101	4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo
ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4675 diff changeset	102	67ec16bde7f1575d523313b9bca000f6a6f12dca bar
4175 fc12ac3755d5 Test update to branch tip Brendan Cully <brendan@kublai.com> parents: 4169 diff changeset	103	% update with no arguments: tipmost revision of the current branch
fc12ac3755d5 Test update to branch tip Brendan Cully <brendan@kublai.com> parents: 4169 diff changeset	104	bf1bc2f45e83
fc12ac3755d5 Test update to branch tip Brendan Cully <brendan@kublai.com> parents: 4169 diff changeset	105	4909a3732169 (foo) tip
4602 d9d177ef748a Fix up tests for new branch message Brendan Cully <brendan@kublai.com> parents: 4410 diff changeset	106	marked working directory as branch foobar
4231 83153299aab5 avoid a traceback with hg branch newbranch; hg up Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4177 diff changeset	107	abort: branch foobar not found
4410 bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	108	% fastforward merge
4602 d9d177ef748a Fix up tests for new branch message Brendan Cully <brendan@kublai.com> parents: 4410 diff changeset	109	marked working directory as branch ff
4410 bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	110	adding ff
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	111	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	112	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	113	(branch merge, don't forget to commit)
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	114	foo
4623 66ed92ed115a Make fast-forward merges full merges Brendan Cully <brendan@kublai.com> parents: 4602 diff changeset	115	changeset: 6:f0c74f92a385
4410 bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	116	branch: foo
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	117	tag: tip
4623 66ed92ed115a Make fast-forward merges full merges Brendan Cully <brendan@kublai.com> parents: 4602 diff changeset	118	parent: 4:4909a3732169
66ed92ed115a Make fast-forward merges full merges Brendan Cully <brendan@kublai.com> parents: 4602 diff changeset	119	parent: 5:c420d2121b71
4410 bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	120	user: test
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	121	date: Mon Jan 12 13:46:40 1970 +0000
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	122	summary: Merge ff into foo
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	123
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	124	a
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	125	ff
6723 1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	126	% test merging, add 3 default heads and one test head
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	127	adding a
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	128	adding b
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	129	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	130	adding c
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	131	created new head
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	132	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	133	adding d
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	134	created new head
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	135	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	136	marked working directory as branch test
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	137	adding e
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	138	changeset: 4:3a1e01ed1df4
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	139	branch: test
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	140	tag: tip
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	141	parent: 0:cb9a9f314b8b
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	142	user: test
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	143	date: Thu Jan 01 00:00:00 1970 +0000
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	144	summary: e
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	145
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	146	changeset: 3:980f7dc84c29
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	147	parent: 0:cb9a9f314b8b
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	148	user: test
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	149	date: Thu Jan 01 00:00:00 1970 +0000
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	150	summary: d
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	151
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	152	changeset: 2:d36c0562f908
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	153	parent: 0:cb9a9f314b8b
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	154	user: test
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	155	date: Thu Jan 01 00:00:00 1970 +0000
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	156	summary: c
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	157
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	158	changeset: 1:d2ae7f538514
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	159	user: test
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	160	date: Thu Jan 01 00:00:00 1970 +0000
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	161	summary: b
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	162
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	163	changeset: 0:cb9a9f314b8b
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	164	user: test
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	165	date: Thu Jan 01 00:00:00 1970 +0000
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	166	summary: a
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	167
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	168	% implicit merge with test branch as parent
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	169	abort: branch 'test' has one head - please merge with an explicit rev
10355 a5576908b589 merge: add hints about the use of 'hg heads' to find the rev to merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8959 diff changeset	170	(run 'hg heads' to see all heads)
6723 1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	171	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	172	% implicit merge with default branch as parent
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	173	abort: branch 'default' has 3 heads - please merge with an explicit rev
10355 a5576908b589 merge: add hints about the use of 'hg heads' to find the rev to merge Benoit Boissinot <benoit.boissinot@ens-lyon.org> parents: 8959 diff changeset	174	(run 'hg heads .' to see heads)
6723 1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	175	% 3 branch heads, explicit merge required
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	176	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	177	(branch merge, don't forget to commit)
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	178	% 2 branch heads, implicit merge works
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	179	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	180	(branch merge, don't forget to commit)

author	Matt Mackall <mpm@selenic.com>
	Mon, 02 Aug 2010 15:44:54 -0500
changeset 11740	e5c79e31feb6
parent 11317	b66e414d38b0
child 12156	4c94b6d0fb1c
permissions	-rw-r--r--