mercurial: tests/test-branches.t@52ec5c813723 (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
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	11	$ hg commit -d '1 0' -m "Adding a branch"
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	12
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	13	$ hg branch q
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	14	marked working directory as branch q
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	15	$ echo 'aa' >a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	16	$ hg branch -C
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	17	reset working directory to branch a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	18	$ 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	19
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	20	$ hg update -C 0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	21	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	22	$ echo 'b' >b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	23	$ hg add b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	24	$ hg branch b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	25	marked working directory as branch b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	26	$ hg commit -d '2 0' -m "Adding b branch"
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	27
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	28	$ echo 'bh1' >bh1
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	29	$ hg add bh1
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	30	$ 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	31
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	32	$ hg update -C 2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	33	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	34	$ echo 'bh2' >bh2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	35	$ hg add bh2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	36	$ 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	37
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	38	$ echo 'c' >c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	39	$ hg add c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	40	$ hg branch c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	41	marked working directory as branch c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	42	$ hg commit -d '5 0' -m "Adding c branch"
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	43
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	44	$ hg branch tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	45	abort: the name 'tip' is reserved
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	46	$ hg branch null
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	47	abort: the name 'null' is reserved
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	48	$ hg branch .
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	49	abort: the name '.' is reserved
7006 92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	50
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	51	$ echo 'd' >d
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	52	$ hg add d
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	53	$ 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	54	marked working directory as 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	55	$ 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	56
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	57	$ hg branches
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	58	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	59	b 4:aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	60	c 6:589736a22561 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	61	a 5:d8cbc61dbaa6 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	62	default 0:19709c5a4e75 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	63
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	64	-------
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	65
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	66	$ hg branches -a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	67	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	68	b 4:aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	69
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	70	--- 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	71
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	72	$ hg log -b a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	73	changeset: 5:d8cbc61dbaa6
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	74	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	75	parent: 2:881fe2b92ad0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	76	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	77	date: Thu Jan 01 00:00:04 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	78	summary: Adding b branch head 2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	79
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	80	changeset: 2:881fe2b92ad0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	81	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	82	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	83	date: Thu Jan 01 00:00:02 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	84	summary: Adding to a branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	85
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	86	changeset: 1:dd6b440dd85a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	87	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	88	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	89	date: Thu Jan 01 00:00:01 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	90	summary: Adding a branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	91
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	92
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	93	---- 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	94
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	95	$ hg log -b b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	96	changeset: 4:aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	97	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	98	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	99	date: Thu Jan 01 00:00:03 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	100	summary: Adding b branch head 1
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	101
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	102	changeset: 3:ac22033332d1
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	103	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	104	parent: 0:19709c5a4e75
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	105	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	106	date: Thu Jan 01 00:00:02 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	107	summary: Adding b branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	108
10417 58e040c51231 branch: avoid using reserved tag names Wagner Bruna <wbruna@softwareexpress.com.br> parents: 8991 diff changeset	109
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	110	---- going to test branch closing
6631 a2b13cac0922 Active branches fix (issue1104) Stefano Tortarolo <stefano.tortarolo@gmail.com> parents: 6067 diff changeset	111
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	112	$ hg branches
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	113	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	114	b 4:aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	115	c 6:589736a22561 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	116	a 5:d8cbc61dbaa6 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	117	default 0:19709c5a4e75 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	118	$ hg up -C b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	119	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	120	$ echo 'xxx1' >> b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	121	$ 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	122	$ hg up -C aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	123	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	124	$ echo 'xxx2' >> b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	125	$ 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	126	created new head
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	127	$ echo 'xxx3' >> b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	128	$ 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	129	$ hg branches
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	130	b 10:bfbe841b666e
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	131	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	132	c 6:589736a22561 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	133	a 5:d8cbc61dbaa6 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	134	default 0:19709c5a4e75 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	135	$ hg heads --closed
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	136	changeset: 10:bfbe841b666e
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	137	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	138	tag: tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	139	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	140	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	141	summary: adding another cset to branch b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	142
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	143	changeset: 8:eebb944467c9
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	144	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	145	parent: 4:aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	146	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	147	date: Thu Jan 01 00:00:07 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	148	summary: adding cset to branch b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	149
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	150	changeset: 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	151	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	152	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	153	date: Thu Jan 01 00:00:06 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	154	summary: Adding d branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	155
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	156	changeset: 6:589736a22561
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	157	branch: c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	158	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	159	date: Thu Jan 01 00:00:05 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	160	summary: Adding c branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	161
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	162	changeset: 5:d8cbc61dbaa6
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	163	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	164	parent: 2:881fe2b92ad0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	165	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	166	date: Thu Jan 01 00:00:04 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	167	summary: Adding b branch head 2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	168
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	169	changeset: 0:19709c5a4e75
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	170	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	171	date: Thu Jan 01 00:00:00 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	172	summary: Adding root node
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	173
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	174	$ hg heads
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	175	changeset: 10:bfbe841b666e
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	176	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	177	tag: tip
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:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	180	summary: adding another cset to branch b
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	changeset: 8:eebb944467c9
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	183	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	184	parent: 4:aee39cd168d0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	185	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	186	date: Thu Jan 01 00:00:07 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	187	summary: adding cset to branch b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	188
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	189	changeset: 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	190	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	191	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	192	date: Thu Jan 01 00:00:06 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	193	summary: Adding d branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	194
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	195	changeset: 6:589736a22561
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	196	branch: c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	197	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	198	date: Thu Jan 01 00:00:05 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	199	summary: Adding c branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	200
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	201	changeset: 5:d8cbc61dbaa6
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	202	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	203	parent: 2:881fe2b92ad0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	204	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	205	date: Thu Jan 01 00:00:04 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	206	summary: Adding b branch head 2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	207
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	208	changeset: 0:19709c5a4e75
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	209	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	210	date: Thu Jan 01 00:00:00 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	211	summary: Adding root node
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	212
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	213	$ 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	214	$ hg branches -a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	215	b 8:eebb944467c9
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	216	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	217	$ hg up -C b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	218	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	219	$ 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	220
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	221	--- 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	222
11868 062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	223	$ hg branches
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	c 6:589736a22561 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	226	a 5:d8cbc61dbaa6 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	227	default 0:19709c5a4e75 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	228	$ hg branches -c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	229	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	230	b 12:2da6583810df (closed)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	231	c 6:589736a22561 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	232	a 5:d8cbc61dbaa6 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	233	default 0:19709c5a4e75 (inactive)
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	234	$ hg branches -a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	235	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	236	$ hg heads b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	237	no open branch heads found on branches b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	238	$ hg heads --closed b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	239	changeset: 12:2da6583810df
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	240	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	241	tag: tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	242	parent: 8:eebb944467c9
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	243	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	244	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	245	summary: close this part branch too
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	246
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	247	changeset: 11:c84627f3c15d
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	248	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	249	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	250	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	251	summary: prune bad branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	252
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	253	$ echo 'xxx4' >> b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	254	$ 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	255	reopening closed branch head 12
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	256
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	257	--- branch b is back in action
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	258
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	259	$ hg branches -a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	260	b 13:6ac12926b8c3
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	261	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	262
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	263	---- test heads listings
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	264
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	265	$ hg heads
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	266	changeset: 13:6ac12926b8c3
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	267	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	268	tag: tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	269	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	270	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	271	summary: reopen branch with a change
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	changeset: 7:10ff5895aa57
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	274	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	275	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	276	date: Thu Jan 01 00:00:06 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	277	summary: Adding d branch
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	changeset: 6:589736a22561
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	280	branch: c
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	281	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	282	date: Thu Jan 01 00:00:05 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	283	summary: Adding c branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	284
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	285	changeset: 5:d8cbc61dbaa6
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	286	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	287	parent: 2:881fe2b92ad0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	288	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	289	date: Thu Jan 01 00:00:04 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	290	summary: Adding b branch head 2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	291
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	292	changeset: 0:19709c5a4e75
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	293	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	294	date: Thu Jan 01 00:00:00 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	295	summary: Adding root node
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	296
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	297
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	298	branch default
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	299
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	300	$ hg heads default
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	301	changeset: 0:19709c5a4e75
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:00 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	304	summary: Adding root node
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
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	307	branch a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	308
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	309	$ hg heads a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	310	changeset: 5:d8cbc61dbaa6
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	311	branch: a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	312	parent: 2:881fe2b92ad0
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	313	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	314	date: Thu Jan 01 00:00:04 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	315	summary: Adding b branch head 2
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	316
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	317	$ hg heads --active a
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	318	no open branch heads found on branches a
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	branch b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	321
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	322	$ hg heads b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	323	changeset: 13:6ac12926b8c3
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	324	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	325	tag: tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	326	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	327	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	328	summary: reopen branch with a change
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	329
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	330	$ hg heads --closed b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	331	changeset: 13:6ac12926b8c3
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	332	branch: b
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	333	tag: tip
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	334	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	335	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	336	summary: reopen branch with a change
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	337
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	338	changeset: 11:c84627f3c15d
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	user: test
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	341	date: Thu Jan 01 00:00:09 1970 +0000
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	342	summary: prune bad branch
062052b0d737 tests: unify test-branches Martin Geisler <mg@lazybytes.net> parents: 10417 diff changeset	343
11969 52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	344	default branch colors:
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	345
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	346	$ echo "[extensions]" >> $HGRCPATH
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	347	$ echo "color =" >> $HGRCPATH
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	348
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	349	$ hg up -C c
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	350	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	351	$ 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	352	$ hg up -C b
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	353	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	354	$ hg branches --color=always
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	355	[0;32mb[0m [0;33m 13:6ac12926b8c3[0m
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	356	[0;0ma branch name much longer than the default justification used by branches[0m [0;33m7:10ff5895aa57[0m
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	357	[0;0ma[0m [0;33m 5:d8cbc61dbaa6[0m (inactive)
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	358	[0;0mdefault[0m [0;33m 0:19709c5a4e75[0m (inactive)
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	359
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	360	default closed branch color:
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	361
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	362	$ hg branches --color=always --closed
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	363	[0;32mb[0m [0;33m 13:6ac12926b8c3[0m
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	364	[0;0ma branch name much longer than the default justification used by branches[0m [0;33m7:10ff5895aa57[0m
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	365	[0;30;1mc[0m [0;33m 14:717d2e6fabe1[0m (closed)
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	366	[0;0ma[0m [0;33m 5:d8cbc61dbaa6[0m (inactive)
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	367	[0;0mdefault[0m [0;33m 0:19709c5a4e75[0m (inactive)
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	368
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	369	$ echo "[extensions]" >> $HGRCPATH
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	370	$ echo "color =" >> $HGRCPATH
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	371	$ echo "[color]" >> $HGRCPATH
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	372	$ echo "branches.active = green" >> $HGRCPATH
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	373	$ echo "branches.closed = blue" >> $HGRCPATH
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	374	$ echo "branches.current = red" >> $HGRCPATH
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	375	$ echo "branches.inactive = magenta" >> $HGRCPATH
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	376	$ echo "log.changeset = cyan" >> $HGRCPATH
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	377
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	378	custom branch colors:
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	379
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	380	$ hg branches --color=always
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	381	[0;31mb[0m [0;36m 13:6ac12926b8c3[0m
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	382	[0;32ma branch name much longer than the default justification used by branches[0m [0;36m7:10ff5895aa57[0m
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	383	[0;35ma[0m [0;36m 5:d8cbc61dbaa6[0m (inactive)
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	384	[0;35mdefault[0m [0;36m 0:19709c5a4e75[0m (inactive)
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	custom closed branch color:
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	387
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	388	$ hg branches --color=always --closed
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	389	[0;31mb[0m [0;36m 13:6ac12926b8c3[0m
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	390	[0;32ma branch name much longer than the default justification used by branches[0m [0;36m7:10ff5895aa57[0m
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	391	[0;34mc[0m [0;36m 14:717d2e6fabe1[0m (closed)
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	392	[0;35ma[0m [0;36m 5:d8cbc61dbaa6[0m (inactive)
52ec5c813723 color: enable branches support Jeremy Whitlock <jcscoobyrs@gmail.com> parents: 11868 diff changeset	393	[0;35mdefault[0m [0;36m 0:19709c5a4e75[0m (inactive)

author	Jeremy Whitlock <jcscoobyrs@gmail.com>
	Wed, 28 Jul 2010 23:05:03 -0600
changeset 11969	52ec5c813723
parent 11868	062052b0d737
child 12316	4134686b83e1
permissions	-rw-r--r--