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

author	David Soria Parra <dsp@php.net>
	Sat, 24 Jul 2010 22:15:22 +0200
changeset 11689	1135e42f0049
parent 11173	5b48d819d5f9
permissions	-rw-r--r--