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

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

author	Tim Henigan <tim.henigan@gmail.com>
	Tue, 27 Nov 2012 08:47:35 -0500
branch	stable
changeset 17984	b74361cf7c0a
parent 17850	71c1513fd560
child 18955	f3245f22771c
permissions	-rw-r--r--