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

author	Christian Ebert <blacktrash@gmx.net>
	Wed, 01 Dec 2010 10:51:49 +0100
branch	stable
changeset 13069	6aff4f144ad3
parent 12942	05fffd665170
child 13987	e0f07847f8de
permissions	-rw-r--r--