mercurial: tests/test-branches.t@f2719b387380 (annotated)

11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	1	$ hg init a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	2	$ cd a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	3	$ echo 'root' >root
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	4	$ hg add root
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	5	$ hg commit -d '0 0' -m "Adding root node"
4675 6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches. Eric Hopper <hopper@omnifarious.org> parents: diff changeset	6
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	7	$ echo 'a' >a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	8	$ hg add a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	9	$ hg branch a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	10	marked working directory as branch a
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14162 diff changeset	11	(branches are permanent and global, did you want a bookmark?)
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	12	$ hg commit -d '1 0' -m "Adding a branch"
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	13
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	14	$ hg branch q
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	15	marked working directory as branch q
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14162 diff changeset	16	(branches are permanent and global, did you want a bookmark?)
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	17	$ echo 'aa' >a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	18	$ hg branch -C
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	19	reset working directory to branch a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	20	$ hg commit -d '2 0' -m "Adding to a branch"
4675 6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches. Eric Hopper <hopper@omnifarious.org> parents: diff changeset	21
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	22	$ hg update -C 0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	23	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	24	$ echo 'b' >b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	25	$ hg add b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	26	$ hg branch b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	27	marked working directory as branch b
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14162 diff changeset	28	(branches are permanent and global, did you want a bookmark?)
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	29	$ hg commit -d '2 0' -m "Adding b branch"
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	30
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	31	$ echo 'bh1' >bh1
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	32	$ hg add bh1
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	33	$ hg commit -d '3 0' -m "Adding b branch head 1"
4675 6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches. Eric Hopper <hopper@omnifarious.org> parents: diff changeset	34
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	35	$ hg update -C 2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	36	1 files updated, 0 files merged, 2 files removed, 0 files unresolved
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	37	$ echo 'bh2' >bh2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	38	$ hg add bh2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	39	$ hg commit -d '4 0' -m "Adding b branch head 2"
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	40
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	41	$ echo 'c' >c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	42	$ hg add c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	43	$ hg branch c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	44	marked working directory as branch c
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14162 diff changeset	45	(branches are permanent and global, did you want a bookmark?)
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	46	$ hg commit -d '5 0' -m "Adding c branch"
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	47
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	48	$ hg branch tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	49	abort: the name 'tip' is reserved
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11969 diff changeset	50	[255]
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	51	$ hg branch null
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	52	abort: the name 'null' is reserved
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11969 diff changeset	53	[255]
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	54	$ hg branch .
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	55	abort: the name '.' is reserved
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11969 diff changeset	56	[255]
7006 92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	57
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	58	$ echo 'd' >d
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	59	$ hg add d
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	60	$ hg branch 'a branch name much longer than the default justification used by branches'
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	61	marked working directory as branch a branch name much longer than the default justification used by branches
15615 41885892796e branch: warn on branching Matt Mackall <mpm@selenic.com> parents: 14162 diff changeset	62	(branches are permanent and global, did you want a bookmark?)
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	63	$ hg commit -d '6 0' -m "Adding d branch"
4675 6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches. Eric Hopper <hopper@omnifarious.org> parents: diff changeset	64
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	65	$ hg branches
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	66	a branch name much longer than the default justification used by branches 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	67	b 4:aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	68	c 6:589736a22561 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	69	a 5:d8cbc61dbaa6 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	70	default 0:19709c5a4e75 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	71
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	72	-------
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	73
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	74	$ hg branches -a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	75	a branch name much longer than the default justification used by branches 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	76	b 4:aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	77
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	78	--- Branch a
4675 6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches. Eric Hopper <hopper@omnifarious.org> parents: diff changeset	79
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	80	$ hg log -b a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	81	changeset: 5:d8cbc61dbaa6
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	82	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	83	parent: 2:881fe2b92ad0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	84	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	85	date: Thu Jan 01 00:00:04 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	86	summary: Adding b branch head 2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	87
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	88	changeset: 2:881fe2b92ad0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	89	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	90	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	91	date: Thu Jan 01 00:00:02 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	92	summary: Adding to a branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	93
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	94	changeset: 1:dd6b440dd85a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	95	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	96	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	97	date: Thu Jan 01 00:00:01 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	98	summary: Adding a branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	99
4675 6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches. Eric Hopper <hopper@omnifarious.org> parents: diff changeset	100
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	101	---- Branch b
4675 6858a7477a5e Change branches to sort 'active' branches first, and add an option to show only active branches. Eric Hopper <hopper@omnifarious.org> parents: diff changeset	102
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	103	$ hg log -b b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	104	changeset: 4:aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	105	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	106	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	107	date: Thu Jan 01 00:00:03 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	108	summary: Adding b branch head 1
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	109
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	110	changeset: 3:ac22033332d1
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	111	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	112	parent: 0:19709c5a4e75
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	113	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	114	date: Thu Jan 01 00:00:02 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	115	summary: Adding b branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	116
10417 58e040c51231 branch: avoid using reserved tag names Wagner Bruna <wbruna@softwareexpress.com.br> parents: 8991 diff changeset	117
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	118	---- going to test branch closing
6631 a2b13cac0922 Active branches fix (issue1104) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6067 diff changeset	119
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	120	$ hg branches
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	121	a branch name much longer than the default justification used by branches 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	122	b 4:aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	123	c 6:589736a22561 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	124	a 5:d8cbc61dbaa6 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	125	default 0:19709c5a4e75 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	126	$ hg up -C b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	127	2 files updated, 0 files merged, 4 files removed, 0 files unresolved
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	128	$ echo 'xxx1' >> b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	129	$ hg commit -d '7 0' -m 'adding cset to branch b'
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	130	$ hg up -C aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	131	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	132	$ echo 'xxx2' >> b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	133	$ hg commit -d '8 0' -m 'adding head to branch b'
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	134	created new head
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	135	$ echo 'xxx3' >> b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	136	$ hg commit -d '9 0' -m 'adding another cset to branch b'
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	137	$ hg branches
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	138	b 10:bfbe841b666e
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	139	a branch name much longer than the default justification used by branches 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	140	c 6:589736a22561 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	141	a 5:d8cbc61dbaa6 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	142	default 0:19709c5a4e75 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	143	$ hg heads --closed
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	144	changeset: 10:bfbe841b666e
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	145	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	146	tag: tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	147	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	148	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	149	summary: adding another cset to branch b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	150
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	151	changeset: 8:eebb944467c9
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	152	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	153	parent: 4:aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	154	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	155	date: Thu Jan 01 00:00:07 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	156	summary: adding cset to branch b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	157
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	158	changeset: 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	159	branch: a branch name much longer than the default justification used by branches
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	160	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	161	date: Thu Jan 01 00:00:06 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	162	summary: Adding d branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	163
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	164	changeset: 6:589736a22561
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	165	branch: c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	166	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	167	date: Thu Jan 01 00:00:05 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	168	summary: Adding c branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	169
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	170	changeset: 5:d8cbc61dbaa6
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	171	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	172	parent: 2:881fe2b92ad0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	173	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	174	date: Thu Jan 01 00:00:04 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	175	summary: Adding b branch head 2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	176
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	177	changeset: 0:19709c5a4e75
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	178	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	179	date: Thu Jan 01 00:00:00 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	180	summary: Adding root node
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	181
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	182	$ hg heads
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	183	changeset: 10:bfbe841b666e
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	184	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	185	tag: tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	186	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	187	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	188	summary: adding another cset to branch b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	189
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	190	changeset: 8:eebb944467c9
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	191	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	192	parent: 4:aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	193	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	194	date: Thu Jan 01 00:00:07 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	195	summary: adding cset to branch b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	196
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	197	changeset: 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	198	branch: a branch name much longer than the default justification used by branches
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	199	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	200	date: Thu Jan 01 00:00:06 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	201	summary: Adding d branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	202
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	203	changeset: 6:589736a22561
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	204	branch: c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	205	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	206	date: Thu Jan 01 00:00:05 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	207	summary: Adding c branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	208
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	209	changeset: 5:d8cbc61dbaa6
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	210	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	211	parent: 2:881fe2b92ad0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	212	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	213	date: Thu Jan 01 00:00:04 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	214	summary: Adding b branch head 2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	215
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	216	changeset: 0:19709c5a4e75
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	217	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	218	date: Thu Jan 01 00:00:00 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	219	summary: Adding root node
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	220
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	221	$ hg commit -d '9 0' --close-branch -m 'prune bad branch'
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	222	$ hg branches -a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	223	b 8:eebb944467c9
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	224	a branch name much longer than the default justification used by branches 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	225	$ hg up -C b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	226	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	227	$ hg commit -d '9 0' --close-branch -m 'close this part branch too'
6067 57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	228
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	229	--- b branch should be inactive
7657 405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	230
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	231	$ hg branches
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	232	a branch name much longer than the default justification used by branches 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	233	c 6:589736a22561 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	234	a 5:d8cbc61dbaa6 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	235	default 0:19709c5a4e75 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	236	$ hg branches -c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	237	a branch name much longer than the default justification used by branches 7:10ff5895aa57
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	238	b 12:e3d49c0575d8 (closed)
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	239	c 6:589736a22561 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	240	a 5:d8cbc61dbaa6 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	241	default 0:19709c5a4e75 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	242	$ hg branches -a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	243	a branch name much longer than the default justification used by branches 7:10ff5895aa57
16612 726dd0fc7cfe branches: quiet option observes other parameters Travis Herrick <tthetoad@gmail.com> parents: 15615 diff changeset	244	$ hg branches -q
726dd0fc7cfe branches: quiet option observes other parameters Travis Herrick <tthetoad@gmail.com> parents: 15615 diff changeset	245	a branch name much longer than the default justification used by branches
726dd0fc7cfe branches: quiet option observes other parameters Travis Herrick <tthetoad@gmail.com> parents: 15615 diff changeset	246	c
726dd0fc7cfe branches: quiet option observes other parameters Travis Herrick <tthetoad@gmail.com> parents: 15615 diff changeset	247	a
726dd0fc7cfe branches: quiet option observes other parameters Travis Herrick <tthetoad@gmail.com> parents: 15615 diff changeset	248	default
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	249	$ hg heads b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	250	no open branch heads found on branches b
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11969 diff changeset	251	[1]
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	252	$ hg heads --closed b
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	253	changeset: 12:e3d49c0575d8
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	254	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	255	tag: tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	256	parent: 8:eebb944467c9
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	257	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	258	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	259	summary: close this part branch too
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	260
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	261	changeset: 11:d3f163457ebf
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	262	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	263	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	264	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	265	summary: prune bad branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	266
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	267	$ echo 'xxx4' >> b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	268	$ hg commit -d '9 0' -m 'reopen branch with a change'
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	269	reopening closed branch head 12
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	270
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	271	--- branch b is back in action
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	272
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	273	$ hg branches -a
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	274	b 13:e23b5505d1ad
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	275	a branch name much longer than the default justification used by branches 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	276
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	277	---- test heads listings
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	278
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	279	$ hg heads
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	280	changeset: 13:e23b5505d1ad
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	281	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	282	tag: tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	283	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	284	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	285	summary: reopen branch with a change
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	286
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	287	changeset: 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	288	branch: a branch name much longer than the default justification used by branches
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	289	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	290	date: Thu Jan 01 00:00:06 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	291	summary: Adding d branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	292
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	293	changeset: 6:589736a22561
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	294	branch: c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	295	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	296	date: Thu Jan 01 00:00:05 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	297	summary: Adding c branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	298
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	299	changeset: 5:d8cbc61dbaa6
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	300	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	301	parent: 2:881fe2b92ad0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	302	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	303	date: Thu Jan 01 00:00:04 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	304	summary: Adding b branch head 2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	305
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	306	changeset: 0:19709c5a4e75
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	307	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	308	date: Thu Jan 01 00:00:00 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	309	summary: Adding root node
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	310
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	311
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	312	branch default
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	313
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	314	$ hg heads default
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	315	changeset: 0:19709c5a4e75
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	316	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	317	date: Thu Jan 01 00:00:00 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	318	summary: Adding root node
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	319
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	320
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	321	branch a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	322
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	323	$ hg heads a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	324	changeset: 5:d8cbc61dbaa6
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	325	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	326	parent: 2:881fe2b92ad0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	327	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	328	date: Thu Jan 01 00:00:04 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	329	summary: Adding b branch head 2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	330
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	331	$ hg heads --active a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	332	no open branch heads found on branches a
12316 4134686b83e1 tests: add exit codes to unified tests Matt Mackall <mpm@selenic.com> parents: 11969 diff changeset	333	[1]
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	334
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	335	branch b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	336
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	337	$ hg heads b
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	338	changeset: 13:e23b5505d1ad
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	339	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	340	tag: tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	341	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	342	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	343	summary: reopen branch with a change
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	344
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	345	$ hg heads --closed b
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	346	changeset: 13:e23b5505d1ad
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	347	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	348	tag: tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	349	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	350	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	351	summary: reopen branch with a change
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	352
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	353	changeset: 11:d3f163457ebf
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	354	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	355	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	356	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	357	summary: prune bad branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	358
11969 52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	359	default branch colors:
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	360
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	361	$ echo "[extensions]" >> $HGRCPATH
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	362	$ echo "color =" >> $HGRCPATH
13987 e0f07847f8de color: add support for terminfo-based attributes and color Danek Duvall <duvall@comfychair.org> parents: 12942 diff changeset	363	$ echo "[color]" >> $HGRCPATH
e0f07847f8de color: add support for terminfo-based attributes and color Danek Duvall <duvall@comfychair.org> parents: 12942 diff changeset	364	$ echo "mode = ansi" >> $HGRCPATH
11969 52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	365
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	366	$ hg up -C c
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	367	3 files updated, 0 files merged, 2 files removed, 0 files unresolved
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	368	$ hg commit -d '9 0' --close-branch -m 'reclosing this branch'
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	369	$ hg up -C b
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	370	2 files updated, 0 files merged, 3 files removed, 0 files unresolved
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	371	$ hg branches --color=always
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	372	\x1b[0;32mb\x1b[0m \x1b[0;33m 13:e23b5505d1ad\x1b[0m (esc)
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12316 diff changeset	373	\x1b[0;0ma branch name much longer than the default justification used by branches\x1b[0m \x1b[0;33m7:10ff5895aa57\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12316 diff changeset	374	\x1b[0;0ma\x1b[0m \x1b[0;33m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12316 diff changeset	375	\x1b[0;0mdefault\x1b[0m \x1b[0;33m 0:19709c5a4e75\x1b[0m (inactive) (esc)
11969 52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	376
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	377	default closed branch color:
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	378
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	379	$ hg branches --color=always --closed
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	380	\x1b[0;32mb\x1b[0m \x1b[0;33m 13:e23b5505d1ad\x1b[0m (esc)
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12316 diff changeset	381	\x1b[0;0ma branch name much longer than the default justification used by branches\x1b[0m \x1b[0;33m7:10ff5895aa57\x1b[0m (esc)
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	382	\x1b[0;30;1mc\x1b[0m \x1b[0;33m 14:f894c25619d3\x1b[0m (closed) (esc)
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12316 diff changeset	383	\x1b[0;0ma\x1b[0m \x1b[0;33m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12316 diff changeset	384	\x1b[0;0mdefault\x1b[0m \x1b[0;33m 0:19709c5a4e75\x1b[0m (inactive) (esc)
11969 52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	385
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	386	$ echo "[extensions]" >> $HGRCPATH
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	387	$ echo "color =" >> $HGRCPATH
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	388	$ echo "[color]" >> $HGRCPATH
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	389	$ echo "branches.active = green" >> $HGRCPATH
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	390	$ echo "branches.closed = blue" >> $HGRCPATH
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	391	$ echo "branches.current = red" >> $HGRCPATH
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	392	$ echo "branches.inactive = magenta" >> $HGRCPATH
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	393	$ echo "log.changeset = cyan" >> $HGRCPATH
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	394
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	395	custom branch colors:
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	396
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	397	$ hg branches --color=always
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	398	\x1b[0;31mb\x1b[0m \x1b[0;36m 13:e23b5505d1ad\x1b[0m (esc)
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12316 diff changeset	399	\x1b[0;32ma branch name much longer than the default justification used by branches\x1b[0m \x1b[0;36m7:10ff5895aa57\x1b[0m (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12316 diff changeset	400	\x1b[0;35ma\x1b[0m \x1b[0;36m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12316 diff changeset	401	\x1b[0;35mdefault\x1b[0m \x1b[0;36m 0:19709c5a4e75\x1b[0m (inactive) (esc)
11969 52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	402
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	403	custom closed branch color:
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	404
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	405	$ hg branches --color=always --closed
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	406	\x1b[0;31mb\x1b[0m \x1b[0;36m 13:e23b5505d1ad\x1b[0m (esc)
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12316 diff changeset	407	\x1b[0;32ma branch name much longer than the default justification used by branches\x1b[0m \x1b[0;36m7:10ff5895aa57\x1b[0m (esc)
14162 301725c3df9a localrepo: reuse parent manifest in commitctx if no files have changed Peter Arrenbrecht <peter.arrenbrecht@gmail.com> parents: 13987 diff changeset	408	\x1b[0;34mc\x1b[0m \x1b[0;36m 14:f894c25619d3\x1b[0m (closed) (esc)
12942 05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12316 diff changeset	409	\x1b[0;35ma\x1b[0m \x1b[0;36m 5:d8cbc61dbaa6\x1b[0m (inactive) (esc)
05fffd665170 tests: use (esc) for all non-ASCII test output Mads Kiilerich <mads@kiilerich.com> parents: 12316 diff changeset	410	\x1b[0;35mdefault\x1b[0m \x1b[0;36m 0:19709c5a4e75\x1b[0m (inactive) (esc)
16913 f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16612 diff changeset	411
f2719b387380 tests: add missing trailing 'cd ..' Mads Kiilerich <mads@kiilerich.com> parents: 16612 diff changeset	412	$ cd ..

author	Mads Kiilerich <mads@kiilerich.com>
	Mon, 11 Jun 2012 01:40:51 +0200
changeset 16913	f2719b387380
parent 16612	726dd0fc7cfe
child 17821	361ab1e2086f
permissions	-rw-r--r--