Mercurial: tests/test-branches.out@fd511e9eeea6 (annotated)

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	1	marked working directory as branch a
7006 92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	2	marked working directory as branch q
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	3	reset working directory to 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	4	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
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	5	marked working directory as branch b
6336 4b0c9c674707 warn about new heads on commit (issue842) Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 6067 diff changeset	6	created new head
7006 92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	7	1 files updated, 0 files merged, 2 files removed, 0 files unresolved
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	8	marked working directory as branch c
6815 7d6622eaad08 test-branches: add a test for long branch name (issue 1230) Patrick Mezard <pmezard@gmail.com> parents: 6631 diff changeset	9	marked working directory as branch a branch name much longer than the default justification used by branches
7006 92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	10	a branch name much longer than the default justification used by branches 7:10ff5895aa57
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	11	b 4:aee39cd168d0
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	12	c 6:589736a22561 (inactive)
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	13	a 5:d8cbc61dbaa6 (inactive)
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	14	default 0:19709c5a4e75 (inactive)
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	15	-------
7006 92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	16	a branch name much longer than the default justification used by branches 7:10ff5895aa57
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	17	b 4:aee39cd168d0
6067 57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	18	--- Branch a
7006 92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	19	changeset: 5:d8cbc61dbaa6
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	20	branch: a
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	21	parent: 2:881fe2b92ad0
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	22	user: test
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	23	date: Thu Jan 01 00:00:04 1970 +0000
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	24	summary: Adding b branch head 2
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	25
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	26	changeset: 2:881fe2b92ad0
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	27	branch: a
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	28	user: test
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	29	date: Thu Jan 01 00:00:02 1970 +0000
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	30	summary: Adding to a branch
92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	31
6067 57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	32	changeset: 1:dd6b440dd85a
57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	33	branch: a
57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	34	user: test
57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	35	date: Thu Jan 01 00:00:01 1970 +0000
57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	36	summary: Adding a branch
57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	37
57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	38	---- Branch b
7006 92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	39	changeset: 4:aee39cd168d0
6067 57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	40	branch: b
57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	41	user: test
57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	42	date: Thu Jan 01 00:00:03 1970 +0000
57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	43	summary: Adding b branch head 1
57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	44
7006 92d44ec32430 branch: added more support for named branches Sune Foldager <cryo@cyanite.org> parents: 6815 diff changeset	45	changeset: 3:ac22033332d1
6067 57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	46	branch: b
57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	47	parent: 0:19709c5a4e75
57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	48	user: test
57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	49	date: Thu Jan 01 00:00:02 1970 +0000
57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	50	summary: Adding b branch
57c1a7052982 Option to log to only show changesets within a specified branch. Dustin Sallings <dustin@spy.net> parents: 4675 diff changeset	51
7657 405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	52	---- going to test branch closing
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	53	a branch name much longer than the default justification used by branches 7:10ff5895aa57
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	54	b 4:aee39cd168d0
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	55	c 6:589736a22561 (inactive)
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	56	a 5:d8cbc61dbaa6 (inactive)
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	57	default 0:19709c5a4e75 (inactive)
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	58	2 files updated, 0 files merged, 4 files removed, 0 files unresolved
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	59	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	60	created new head
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	61	b 10:bfbe841b666e
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	62	a branch name much longer than the default justification used by branches 7:10ff5895aa57
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	63	c 6:589736a22561 (inactive)
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	64	a 5:d8cbc61dbaa6 (inactive)
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	65	default 0:19709c5a4e75 (inactive)
10345 bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	66	changeset: 10:bfbe841b666e
bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	67	branch: b
bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	68	tag: tip
bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	69	user: test
bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	70	date: Thu Jan 01 00:00:09 1970 +0000
bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	71	summary: adding another cset to branch b
bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	72
bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	73	changeset: 8:eebb944467c9
bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	74	branch: b
bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	75	parent: 4:aee39cd168d0
bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	76	user: test
bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	77	date: Thu Jan 01 00:00:07 1970 +0000
bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	78	summary: adding cset to branch b
bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	79
bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	80	changeset: 7:10ff5895aa57
bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	81	branch: a branch name much longer than the default justification used by branches
bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	82	user: test
bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	83	date: Thu Jan 01 00:00:06 1970 +0000
bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	84	summary: Adding d branch
bc2866bdf3e0 commands: allow --closed even for topological heads displays Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 9189 diff changeset	85
10350 fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	86	changeset: 6:589736a22561
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	87	branch: c
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	88	user: test
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	89	date: Thu Jan 01 00:00:05 1970 +0000
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	90	summary: Adding c branch
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	91
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	92	changeset: 5:d8cbc61dbaa6
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	93	branch: a
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	94	parent: 2:881fe2b92ad0
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	95	user: test
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	96	date: Thu Jan 01 00:00:04 1970 +0000
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	97	summary: Adding b branch head 2
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	98
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	99	changeset: 0:19709c5a4e75
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	100	user: test
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	101	date: Thu Jan 01 00:00:00 1970 +0000
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	102	summary: Adding root node
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	103
7657 405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	104	changeset: 10:bfbe841b666e
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	105	branch: b
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	106	tag: tip
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	107	user: test
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	108	date: Thu Jan 01 00:00:09 1970 +0000
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	109	summary: adding another cset to branch b
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	110
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	111	changeset: 8:eebb944467c9
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	112	branch: b
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	113	parent: 4:aee39cd168d0
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	114	user: test
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	115	date: Thu Jan 01 00:00:07 1970 +0000
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	116	summary: adding cset to branch b
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	117
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	118	changeset: 7:10ff5895aa57
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	119	branch: a branch name much longer than the default justification used by branches
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	120	user: test
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	121	date: Thu Jan 01 00:00:06 1970 +0000
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	122	summary: Adding d branch
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	123
10350 fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	124	changeset: 6:589736a22561
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	125	branch: c
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	126	user: test
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	127	date: Thu Jan 01 00:00:05 1970 +0000
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	128	summary: Adding c branch
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	129
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	130	changeset: 5:d8cbc61dbaa6
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	131	branch: a
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	132	parent: 2:881fe2b92ad0
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	133	user: test
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	134	date: Thu Jan 01 00:00:04 1970 +0000
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	135	summary: Adding b branch head 2
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	136
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	137	changeset: 0:19709c5a4e75
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	138	user: test
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	139	date: Thu Jan 01 00:00:00 1970 +0000
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	140	summary: Adding root node
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	141
7657 405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	142	b 8:eebb944467c9
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	143	a branch name much longer than the default justification used by branches 7:10ff5895aa57
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	144	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	145	--- b branch should be inactive
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	146	a branch name much longer than the default justification used by branches 7:10ff5895aa57
8991 7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	147	c 6:589736a22561 (inactive)
7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	148	a 5:d8cbc61dbaa6 (inactive)
7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	149	default 0:19709c5a4e75 (inactive)
7e0b31dfc66f branches: add --closed flag for consistency with heads Matt Mackall <mpm@selenic.com> parents: 8796 diff changeset	150	a branch name much longer than the default justification used by branches 7:10ff5895aa57
7657 405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	151	b 12:2da6583810df (closed)
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	152	c 6:589736a22561 (inactive)
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	153	a 5:d8cbc61dbaa6 (inactive)
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	154	default 0:19709c5a4e75 (inactive)
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	155	a branch name much longer than the default justification used by branches 7:10ff5895aa57
10346 e2db50cae6e6 commands: don't do too much work for error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10345 diff changeset	156	no open branch heads found on branches b
8796 2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	157	changeset: 12:2da6583810df
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	158	branch: b
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	159	tag: tip
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	160	parent: 8:eebb944467c9
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	161	user: test
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	162	date: Thu Jan 01 00:00:09 1970 +0000
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	163	summary: close this part branch too
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	164
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	165	changeset: 11:c84627f3c15d
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	166	branch: b
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	167	user: test
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	168	date: Thu Jan 01 00:00:09 1970 +0000
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	169	summary: prune bad branch
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	170
7657 405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	171	--- branch b is back in action
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	172	b 13:6ac12926b8c3
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	173	a branch name much longer than the default justification used by branches 7:10ff5895aa57
8796 2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	174	---- test heads listings
7657 405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	175	changeset: 13:6ac12926b8c3
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	176	branch: b
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	177	tag: tip
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	178	user: test
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	179	date: Thu Jan 01 00:00:09 1970 +0000
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	180	summary: reopen branch with a change
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	181
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	182	changeset: 7:10ff5895aa57
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	183	branch: a branch name much longer than the default justification used by branches
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	184	user: test
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	185	date: Thu Jan 01 00:00:06 1970 +0000
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	186	summary: Adding d branch
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	187
10350 fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	188	changeset: 6:589736a22561
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	189	branch: c
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	190	user: test
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	191	date: Thu Jan 01 00:00:05 1970 +0000
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	192	summary: Adding c branch
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	193
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	194	changeset: 5:d8cbc61dbaa6
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	195	branch: a
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	196	parent: 2:881fe2b92ad0
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	197	user: test
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	198	date: Thu Jan 01 00:00:04 1970 +0000
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	199	summary: Adding b branch head 2
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	200
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	201	changeset: 0:19709c5a4e75
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	202	user: test
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	203	date: Thu Jan 01 00:00:00 1970 +0000
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	204	summary: Adding root node
fd511e9eeea6 commands: do all branch heads by default, demote topological to -t/--topo Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10349 diff changeset	205
8796 2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	206	% branch default
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	207	changeset: 0:19709c5a4e75
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	208	user: test
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	209	date: Thu Jan 01 00:00:00 1970 +0000
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	210	summary: Adding root node
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	211
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	212	% branch a
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	213	changeset: 5:d8cbc61dbaa6
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	214	branch: a
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	215	parent: 2:881fe2b92ad0
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	216	user: test
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	217	date: Thu Jan 01 00:00:04 1970 +0000
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	218	summary: Adding b branch head 2
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	219
10346 e2db50cae6e6 commands: don't do too much work for error messages Dirkjan Ochtman <dirkjan@ochtman.nl> parents: 10345 diff changeset	220	no open branch heads found on branches a
8796 2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	221	% branch b
7657 405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	222	changeset: 13:6ac12926b8c3
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	223	branch: b
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	224	tag: tip
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	225	user: test
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	226	date: Thu Jan 01 00:00:09 1970 +0000
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	227	summary: reopen branch with a change
405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	228
8796 2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	229	changeset: 13:6ac12926b8c3
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	230	branch: b
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	231	tag: tip
7657 405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	232	user: test
8796 2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	233	date: Thu Jan 01 00:00:09 1970 +0000
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	234	summary: reopen branch with a change
7657 405cacb06745 branch closing: add test for branch closing (and reopening) John Mulligan <phlogistonjohn@asynchrono.us> parents: 7006 diff changeset	235
8796 2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	236	changeset: 11:c84627f3c15d
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	237	branch: b
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	238	user: test
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	239	date: Thu Jan 01 00:00:09 1970 +0000
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	240	summary: prune bad branch
2bcef677a6c3 localrepo: remove 'closed' argument to heads(...) function John Mulligan <phlogistonjohn@asynchrono.us> parents: 7657 diff changeset	241

author	Dirkjan Ochtman <dirkjan@ochtman.nl>
	Sat, 06 Feb 2010 19:38:39 +0100
changeset 10350	fd511e9eeea6
parent 10349	20356e69710c
child 10420	41d0ed2c79df
permissions	-rw-r--r--