Mercurial: tests/test-newbranch.out annotate

annotate tests/test-newbranch.out @ 11175:39e7f14a8286

rollback: fix up tests

author	Matt Mackall <mpm@selenic.com>
date	Fri, 14 May 2010 10:01:09 -0500
parents	5b48d819d5f9
children	6e65b451b62e

rev	line source
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
11173 5b48d819d5f9 commit: note new branch heads rather than topological heads Matt Mackall <mpm@selenic.com> parents: 10893 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
11173 5b48d819d5f9 commit: note new branch heads rather than topological heads Matt Mackall <mpm@selenic.com> parents: 10893 diff changeset	20 created new head
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	21 changeset: 5:5f8fb06e083e
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	22 branch: foo
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	23 tag: tip
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	24 parent: 4:4909a3732169
aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	25 parent: 3:bf1bc2f45e83
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	26 user: test
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	27 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	28 summary: merge
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	29
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	30 changeset: 4:4909a3732169
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	31 branch: foo
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	32 parent: 1:b699b1cec9c2
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	33 user: test
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	34 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	35 summary: modify a branch
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	36
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	37 changeset: 3:bf1bc2f45e83
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	38 user: test
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	39 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	40 summary: clear branch name
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	41
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	42 changeset: 2:67ec16bde7f1
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	43 branch: bar
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	44 user: test
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	45 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	46 summary: change branch name
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	47
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	48 changeset: 1:b699b1cec9c2
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	49 branch: foo
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	50 user: test
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	51 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	52 summary: add branch name
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	53
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	54 changeset: 0:be8523e69bf8
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	55 user: test
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	56 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	57 summary: initial
2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	58
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	59 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	60 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	61 bar 2:67ec16bde7f1 (inactive)
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3451 diff changeset	62 foo
4176 f9bbcebcacea "default" is the default branch name Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4175 diff changeset	63 default
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3451 diff changeset	64 bar
3451 196baf20232b Add test for invalid branch cache (fixed by 27ebe4efe98e) Thomas Arendsen Hein <thomas@intevation.de> parents: 3420 diff changeset	65 % test for invalid branch cache
11175 39e7f14a8286 rollback: fix up tests Matt Mackall <mpm@selenic.com> parents: 11173 diff changeset	66 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	67 changeset: 4:4909a3732169
3451 196baf20232b Add test for invalid branch cache (fixed by 27ebe4efe98e) Thomas Arendsen Hein <thomas@intevation.de> parents: 3420 diff changeset	68 branch: foo
196baf20232b Add test for invalid branch cache (fixed by 27ebe4efe98e) Thomas Arendsen Hein <thomas@intevation.de> parents: 3420 diff changeset	69 tag: tip
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	70 parent: 1:b699b1cec9c2
3451 196baf20232b Add test for invalid branch cache (fixed by 27ebe4efe98e) Thomas Arendsen Hein <thomas@intevation.de> parents: 3420 diff changeset	71 user: test
3760 aeafd80c1e78 small fixes for test-newbranch Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3502 diff changeset	72 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	73 summary: modify a branch
196baf20232b Add test for invalid branch cache (fixed by 27ebe4efe98e) Thomas Arendsen Hein <thomas@intevation.de> parents: 3420 diff changeset	74
6056 0ad2ffbf6b38 Print less scary warning when invalidating the branch cache. Thomas Arendsen Hein <thomas@intevation.de> parents: 5988 diff changeset	75 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	76 changeset: 4:4909a3732169c0c20011c4f4b8fdff4e3d89b23f
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	77 branch: foo
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	78 tag: tip
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	79 parent: 1:b699b1cec9c2966b3700de4fef0dc123cd754c31
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	80 parent: -1:0000000000000000000000000000000000000000
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	81 manifest: 4:d01b250baaa05909152f7ae07d7a649deea0df9a
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	82 user: test
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	83 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	84 files: a
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	85 extra: branch=foo
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	86 description:
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	87 modify a branch
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
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	90 4:4909a3732169
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	91 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4
4176 f9bbcebcacea "default" is the default branch name Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4175 diff changeset	92 bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default
3761 9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	93 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo
9433bdcaa9ae Ignore all errors while parsing the branch cache. Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 3760 diff changeset	94 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	95 % 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	96 % 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	97 be8523e69bf892e25817fc97187516b3c0804ae4 0
ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4675 diff changeset	98 be8523e69bf892e25817fc97187516b3c0804ae4 default
ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4675 diff changeset	99 % pushing everything
ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4675 diff changeset	100 4909a3732169c0c20011c4f4b8fdff4e3d89b23f 4
ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4675 diff changeset	101 bf1bc2f45e834c75404d0ddab57d53beab56e2f8 default
ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4675 diff changeset	102 4909a3732169c0c20011c4f4b8fdff4e3d89b23f foo
ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4675 diff changeset	103 67ec16bde7f1575d523313b9bca000f6a6f12dca bar
4175 fc12ac3755d5 Test update to branch tip Brendan Cully <brendan@kublai.com> parents: 4169 diff changeset	104 % 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	105 bf1bc2f45e83
fc12ac3755d5 Test update to branch tip Brendan Cully <brendan@kublai.com> parents: 4169 diff changeset	106 4909a3732169 (foo) tip
4602 d9d177ef748a Fix up tests for new branch message Brendan Cully <brendan@kublai.com> parents: 4410 diff changeset	107 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	108 abort: branch foobar not found
4410 bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	109 % fastforward merge
4602 d9d177ef748a Fix up tests for new branch message Brendan Cully <brendan@kublai.com> parents: 4410 diff changeset	110 marked working directory as branch ff
4410 bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	111 adding ff
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	112 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	113 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	114 (branch merge, don't forget to commit)
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	115 foo
11173 5b48d819d5f9 commit: note new branch heads rather than topological heads Matt Mackall <mpm@selenic.com> parents: 10893 diff changeset	116 created new head
4623 66ed92ed115a Make fast-forward merges full merges Brendan Cully <brendan@kublai.com> parents: 4602 diff changeset	117 changeset: 6:f0c74f92a385
4410 bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	118 branch: foo
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	119 tag: tip
4623 66ed92ed115a Make fast-forward merges full merges Brendan Cully <brendan@kublai.com> parents: 4602 diff changeset	120 parent: 4:4909a3732169
66ed92ed115a Make fast-forward merges full merges Brendan Cully <brendan@kublai.com> parents: 4602 diff changeset	121 parent: 5:c420d2121b71
4410 bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	122 user: test
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	123 date: Mon Jan 12 13:46:40 1970 +0000
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	124 summary: Merge ff into foo
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	125
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	126 a
bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	127 ff
6723 1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	128 % 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	129 adding a
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	130 adding b
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	131 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	132 adding c
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	133 created new head
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	134 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	135 adding d
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	136 created new head
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	137 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	138 marked working directory as branch test
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	139 adding e
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	140 changeset: 4:3a1e01ed1df4
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	141 branch: test
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	142 tag: tip
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	143 parent: 0:cb9a9f314b8b
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	144 user: test
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	145 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	146 summary: e
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	147
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	148 changeset: 3:980f7dc84c29
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	149 parent: 0:cb9a9f314b8b
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	150 user: test
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	151 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	152 summary: d
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	153
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	154 changeset: 2:d36c0562f908
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	155 parent: 0:cb9a9f314b8b
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	156 user: test
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	157 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	158 summary: c
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	159
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	160 changeset: 1:d2ae7f538514
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	161 user: test
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	162 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	163 summary: b
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	164
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	165 changeset: 0:cb9a9f314b8b
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	166 user: test
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	167 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	168 summary: a
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	169
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	170 % 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	171 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	172 (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	173 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	174 % 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	175 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	176 (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	177 % 3 branch heads, explicit merge required
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	178 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	179 (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	180 % 2 branch heads, implicit merge works
1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6336 diff changeset	181 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	182 (branch merge, don't forget to commit)

Mercurial > hg

annotate tests/test-newbranch.out @ 11175:39e7f14a8286