mercurial: tests/test-newbranch.t@a55b06885cda (annotated)

13272 5ccdca7df211 move tags.cache and branchheads.cache to a collected cache folder .hg/cache/ jfh <jason@jasonfharris.com> parents: 13158 diff changeset	1	$ branchcache=.hg/cache/branchheads
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	2
18234 a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	3	$ listbranchcaches() {
a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	4	> for f in .hg/cache/branchheads*;
a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	5	> do echo === $f ===;
a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	6	> cat $f;
a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	7	> done;
a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	8	> }
a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	9	$ purgebranchcaches() {
a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	10	> rm .hg/cache/branchheads*
a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	11	> }
a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	12
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	13	$ hg init t
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	14	$ cd t
6160 3ee3bc5d06c5 tests: hide the name of the branch cache file Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 5988 diff changeset	15
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	16	$ hg branches
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	17	$ echo foo > a
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	18	$ hg add a
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	19	$ hg ci -m "initial"
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	20	$ hg branch foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	21	marked working directory as branch foo
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14198 diff changeset	22	(branches are permanent and global, did you want a bookmark?)
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	23	$ hg branch
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	24	foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	25	$ hg ci -m "add branch name"
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	26	$ hg branch bar
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	27	marked working directory as branch bar
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14198 diff changeset	28	(branches are permanent and global, did you want a bookmark?)
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	29	$ hg ci -m "change branch name"
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	30
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	31	Branch shadowing:
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	32
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	33	$ hg branch default
14198 8f11fd321014 commands: use util.Abort's hint some more Martin Geisler <mg@aragost.com> parents: 14162 diff changeset	34	abort: a branch of the same name already exists
8f11fd321014 commands: use util.Abort's hint some more Martin Geisler <mg@aragost.com> parents: 14162 diff changeset	35	(use 'hg update' to switch to it)
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12279 diff changeset	36	[255]
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	37
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	38	$ hg branch -f default
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	39	marked working directory as branch default
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14198 diff changeset	40	(branches are permanent and global, did you want a bookmark?)
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	41
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	42	$ hg ci -m "clear branch name"
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	43	created new head
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	44
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	45	There should be only one default branch head
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	46
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	47	$ hg heads .
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	48	changeset: 3:1c28f494dae6
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	49	tag: tip
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	50	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	51	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	52	summary: clear branch name
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	53
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	54
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	55	$ hg co foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	56	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	57	$ hg branch
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	58	foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	59	$ echo bleah > a
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	60	$ hg ci -m "modify a branch"
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	61
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	62	$ hg merge default
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	63	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	64	(branch merge, don't forget to commit)
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	65
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	66	$ hg branch
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	67	foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	68	$ hg ci -m "merge"
8954 e67e5b60e55f Branch heads should not include "heads" that are ancestors of other heads. Brendan Cully <brendan@kublai.com> parents: 7654 diff changeset	69
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	70	$ hg log
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	71	changeset: 5:530046499edf
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	72	branch: foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	73	tag: tip
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	74	parent: 4:adf1a74a7f7b
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	75	parent: 3:1c28f494dae6
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	76	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	77	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	78	summary: merge
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	79
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	80	changeset: 4:adf1a74a7f7b
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	81	branch: foo
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	82	parent: 1:6c0e42da283a
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	83	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	84	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	85	summary: modify a branch
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	86
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	87	changeset: 3:1c28f494dae6
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	88	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	89	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	90	summary: clear branch name
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	91
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	92	changeset: 2:c21617b13b22
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	93	branch: bar
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	94	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	95	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	96	summary: change branch name
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	97
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	98	changeset: 1:6c0e42da283a
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	99	branch: foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	100	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	101	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	102	summary: add branch name
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	103
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	104	changeset: 0:db01e8ea3388
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	105	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	106	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	107	summary: initial
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	108
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	109	$ hg branches
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	110	foo 5:530046499edf
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	111	default 3:1c28f494dae6 (inactive)
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	112	bar 2:c21617b13b22 (inactive)
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	113
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	114	$ hg branches -q
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	115	foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	116	default
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	117	bar
3420 2576b6731524 Add some basic branch name tests Matt Mackall <mpm@selenic.com> parents: diff changeset	118
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	119	Test for invalid branch cache:
3502 8dc14d630b29 add branch and branches commands Matt Mackall <mpm@selenic.com> parents: 3451 diff changeset	120
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	121	$ hg rollback
13446 1e497df514e2 rollback: clarifies the message about the reverted state (issue2628) Gilles Moris <gilles.moris@free.fr> parents: 13272 diff changeset	122	repository tip rolled back to revision 4 (undo commit)
13455 053c042118bc rollback, i18n: avoid parameterized message Wagner Bruna <wbruna@softwareexpress.com.br> parents: 13446 diff changeset	123	working directory now based on revisions 4 and 3
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	124
18234 a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	125	$ cp ${branchcache}-unserved .hg/bc-invalid
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	126
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	127	$ hg log -r foo
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	128	changeset: 4:adf1a74a7f7b
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	129	branch: foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	130	tag: tip
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	131	parent: 1:6c0e42da283a
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	132	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	133	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	134	summary: modify a branch
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	135
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	136	$ cp .hg/bc-invalid $branchcache
4175 fc12ac3755d5 Test update to branch tip Brendan Cully <brendan@kublai.com> parents: 4169 diff changeset	137
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	138	$ hg --debug log -r foo
18166 3a2e810dd3d8 branchmap: improve invalid cache message when reading Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 16913 diff changeset	139	invalid branchheads cache: tip differs
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	140	changeset: 4:adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	141	branch: foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	142	tag: tip
15907 51fc43253a52 changeset_printer: display changeset phase on debug level Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 15615 diff changeset	143	phase: draft
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	144	parent: 1:6c0e42da283a56b5edc5b4fadb491365ec7f5fa8
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	145	parent: -1:0000000000000000000000000000000000000000
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	146	manifest: 1:8c342a37dfba0b3d3ce073562a00d8a813c54ffe
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	147	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	148	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	149	files: a
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	150	extra: branch=foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	151	description:
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	152	modify a branch
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	153
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	154
18234 a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	155	$ purgebranchcaches
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	156	$ echo corrupted > $branchcache
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	157
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	158	$ hg log -qr foo
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	159	4:adf1a74a7f7b
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	160
18234 a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	161	$ listbranchcaches
a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	162	=== .hg/cache/branchheads ===
a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	163	corrupted
a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	164	=== .hg/cache/branchheads-unserved ===
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	165	adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6 4
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	166	1c28f494dae69a2f8fc815059d257eccf3fcfe75 default
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	167	adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6 foo
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	168	c21617b13b220988e7a2e26290fbe4325ffa7139 bar
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	169
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	170	Push should update the branch cache:
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	171
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	172	$ hg init ../target
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	173
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	174	Pushing just rev 0:
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	175
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	176	$ hg push -qr 0 ../target
5988 ee317dbfb9d0 update the branch cache at the end of addchangegroup Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4410 diff changeset	177
18234 a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	178	$ (cd ../target/; listbranchcaches)
a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	179	=== .hg/cache/branchheads-unserved ===
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	180	db01e8ea3388fd3c7c94e1436ea2bd6a53d581c5 0
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	181	db01e8ea3388fd3c7c94e1436ea2bd6a53d581c5 default
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	182
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	183	Pushing everything:
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	184
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	185	$ hg push -qf ../target
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	186
18234 a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	187	$ (cd ../target/; listbranchcaches)
a55b06885cda branchmap: allow to use cache of subset Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18166 diff changeset	188	=== .hg/cache/branchheads-unserved ===
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	189	adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6 4
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	190	1c28f494dae69a2f8fc815059d257eccf3fcfe75 default
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	191	adf1a74a7f7b4cd193d12992f5d0d6a004ed21d6 foo
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	192	c21617b13b220988e7a2e26290fbe4325ffa7139 bar
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	193
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	194	Update with no arguments: tipmost revision of the current branch:
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	195
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	196	$ hg up -q -C 0
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	197	$ hg up -q
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	198	$ hg id
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	199	1c28f494dae6
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	200
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	201	$ hg up -q 1
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	202	$ hg up -q
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	203	$ hg id
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	204	adf1a74a7f7b (foo) tip
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	205
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	206	$ hg branch foobar
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	207	marked working directory as branch foobar
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14198 diff changeset	208	(branches are permanent and global, did you want a bookmark?)
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	209
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	210	$ hg up
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	211	abort: branch foobar not found
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12279 diff changeset	212	[255]
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	213
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	214	Fastforward merge:
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	215
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	216	$ hg branch ff
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	217	marked working directory as branch ff
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14198 diff changeset	218	(branches are permanent and global, did you want a bookmark?)
4231 83153299aab5 avoid a traceback with hg branch newbranch; hg up Alexis S. L. Carvalho <alexis@cecm.usp.br> parents: 4179 diff changeset	219
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	220	$ echo ff > ff
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	221	$ hg ci -Am'fast forward'
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	222	adding ff
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	223
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	224	$ hg up foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	225	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	226
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	227	$ hg merge ff
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	228	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	229	(branch merge, don't forget to commit)
4410 bbc97d419b16 Add fast-forward branch merging Brendan Cully <brendan@kublai.com> parents: 4232 diff changeset	230
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	231	$ hg branch
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	232	foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	233	$ hg commit -m'Merge ff into foo'
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	234	$ hg parents
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	235	changeset: 6:185ffbfefa30
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	236	branch: foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	237	tag: tip
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	238	parent: 4:adf1a74a7f7b
301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13550 diff changeset	239	parent: 5:1a3c27dc5e11
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	240	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	241	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	242	summary: Merge ff into foo
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	243
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	244	$ hg manifest
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	245	a
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	246	ff
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	247
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	248
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	249	Test merging, add 3 default heads and one test head:
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	250
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	251	$ cd ..
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	252	$ hg init merges
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	253	$ cd merges
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	254	$ echo a > a
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	255	$ hg ci -Ama
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	256	adding a
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	257
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	258	$ echo b > b
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	259	$ hg ci -Amb
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	260	adding b
6723 1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6160 diff changeset	261
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	262	$ hg up 0
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	263	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	264	$ echo c > c
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	265	$ hg ci -Amc
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	266	adding c
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	267	created new head
6723 1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6160 diff changeset	268
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	269	$ hg up 0
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	270	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	271	$ echo d > d
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	272	$ hg ci -Amd
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	273	adding d
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	274	created new head
6723 1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6160 diff changeset	275
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	276	$ hg up 0
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	277	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	278	$ hg branch test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	279	marked working directory as branch test
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14198 diff changeset	280	(branches are permanent and global, did you want a bookmark?)
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	281	$ echo e >> e
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	282	$ hg ci -Ame
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	283	adding e
6723 1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6160 diff changeset	284
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	285	$ hg log
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	286	changeset: 4:3a1e01ed1df4
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	287	branch: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	288	tag: tip
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	289	parent: 0:cb9a9f314b8b
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	290	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	291	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	292	summary: e
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	293
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	294	changeset: 3:980f7dc84c29
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	295	parent: 0:cb9a9f314b8b
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	296	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	297	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	298	summary: d
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	299
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	300	changeset: 2:d36c0562f908
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	301	parent: 0:cb9a9f314b8b
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	302	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	303	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	304	summary: c
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	305
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	306	changeset: 1:d2ae7f538514
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	307	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	308	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	309	summary: b
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	310
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	311	changeset: 0:cb9a9f314b8b
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	312	user: test
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	313	date: Thu Jan 01 00:00:00 1970 +0000
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	314	summary: a
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	315
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	316	Implicit merge with test branch as parent:
6723 1fe6f365df2e merge: only in-branch merges can be implicit Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6160 diff changeset	317
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	318	$ hg merge
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	319	abort: branch 'test' has one head - please merge with an explicit rev
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	320	(run 'hg heads' to see all heads)
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12279 diff changeset	321	[255]
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	322	$ hg up -C default
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	323	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	324
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	325	Implicit merge with default branch as parent:
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	326
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	327	$ hg merge
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	328	abort: branch 'default' has 3 heads - please merge with an explicit rev
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	329	(run 'hg heads .' to see heads)
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 12279 diff changeset	330	[255]
12279 28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	331
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	332	3 branch heads, explicit merge required:
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	333
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	334	$ hg merge 2
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	335	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	336	(branch merge, don't forget to commit)
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	337	$ hg ci -m merge
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	338
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	339	2 branch heads, implicit merge works:
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	340
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	341	$ hg merge
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	342	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	343	(branch merge, don't forget to commit)
28e2e3804f2e combine tests Adrian Buehlmann <adrian@cadifra.com> parents: 12156 diff changeset	344
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 15907 diff changeset	345	$ cd ..

author	Pierre-Yves David <pierre-yves.david@ens-lyon.org>
	Mon, 07 Jan 2013 17:23:25 +0100
changeset 18234	a55b06885cda
parent 18166	3a2e810dd3d8
child 18245	aff706b3a21c
permissions	-rw-r--r--