evolve: tests/test-evolve-templates.t@f555039d1a08 (annotated)

2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1	This test file test the various templates for precursors and successors.
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	2
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	3	Global setup
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	4	============
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	5
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	6	$ . $TESTDIR/testlib/common.sh
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	7	$ cat >> $HGRCPATH <<EOF
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	8	> [ui]
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	9	> interactive = true
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	10	> [phases]
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	11	> publish=False
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	12	> [extensions]
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	13	> evolve =
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	14	> [alias]
2497 1e9b86ed78c9 template: make the template definition more manageable Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2496 diff changeset	15	> tlog = log -G -T '{node\|short}\
1e9b86ed78c9 template: make the template definition more manageable Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2496 diff changeset	16	> {if(precursors, "\n Precursors: {precursors}")}\
2500 2092007af205 template: update precursors template output Boris Feld <boris.feld@octobus.net> parents: 2499 diff changeset	17	> {if(precursors, "\n semi-colon: {join(precursors, "; ")}")}\
2498 b765650b37ee template: skip "successors" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2497 diff changeset	18	> {if(successors, "\n Successors: {successors}")}\
2502 d5db7464676d template: update successors template output Boris Feld <boris.feld@octobus.net> parents: 2500 diff changeset	19	> {if(successors, "\n semi-colon: {join(successors, "; ")}")}\
2629 9c0f6b85c28f obsfate: improve obsfate output Boris Feld <boris.feld@octobus.net> parents: 2613 diff changeset	20	> {if(obsfate, "\n Fate: {join(obsfate, "\n Fate: ")}\n")}\n'
9c0f6b85c28f obsfate: improve obsfate output Boris Feld <boris.feld@octobus.net> parents: 2613 diff changeset	21	> fatelog = log -G -T '{node\|short}\n{if(obsfate, " Obsfate: {join(obsfate, "; ")}\n\n")}'
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	22	> EOF
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	23
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	24	Test templates on amended commit
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	25	================================
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	26
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	27	Test setup
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	28	----------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	29
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	30	$ hg init $TESTTMP/templates-local-amend
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	31	$ cd $TESTTMP/templates-local-amend
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	32	$ mkcommit ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	33	$ mkcommit A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	34	$ echo 42 >> A0
3049 02c4a0b550ab obsfate: update test Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	35	$ HGUSER=test hg amend -m "A1" --config devel.default-date="1234567890 0"
2589 8412b0b7b512 obsfate: build more advanced markers for tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2555 diff changeset	36	$ HGUSER=test2 hg amend -m "A2" --config devel.default-date="987654321 0"
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	37	$ hg log --hidden -G
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	38	@ changeset: 3:d004c8f274b9
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	39	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	40	\| parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	41	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	42	\| date: Thu Jan 01 00:00:00 1970 +0000
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	43	\| summary: A2
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	44	\|
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	45	\| x changeset: 2:a468dc9b3633
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	46	\|/ parent: 0:ea207398892e
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	47	\| user: test
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	48	\| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	49	\| obsolete: reworded using amend as 3:d004c8f274b9 by test2
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	50	\| summary: A1
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	51	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	52	\| x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	53	\|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	54	\| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	55	\| obsolete: rewritten using amend as 2:a468dc9b3633
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	56	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	57	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	58	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	59	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	60	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	61	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	62
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	63	Check templates
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	64	---------------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	65	$ hg up 'desc(A0)' --hidden
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	66	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	67	updated to hidden changeset 471f378eab4c
3432 f57be161f34b test: update with new 'update' hint about obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3431 diff changeset	68	(hidden revision '471f378eab4c' was rewritten as: d004c8f274b9)
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	69	working directory parent is obsolete! (471f378eab4c)
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	70	(use 'hg evolve' to update to its successor: d004c8f274b9)
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	71
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	72	Precursors template should show current revision as it is the working copy
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	73	$ hg olog tip
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	74	o d004c8f274b9 (3) A2
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	75	\|
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	76	x a468dc9b3633 (2) A1
3520 1f0c88a9dd1c tests: commit tests changes missing in the previous changeset Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3432 diff changeset	77	\| rewritten(description) as d004c8f274b9 using amend by test2 (Thu Apr 19 04:25:21 2001 +0000)
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	78	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	79	@ 471f378eab4c (1) A0
3520 1f0c88a9dd1c tests: commit tests changes missing in the previous changeset Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3432 diff changeset	80	rewritten(description, content) as a468dc9b3633 using amend by test (Fri Feb 13 23:31:30 2009 +0000)
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	81
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	82	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	83	o d004c8f274b9
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	84	\| Precursors: 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	85	\| semi-colon: 1:471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	86	\| @ 471f378eab4c
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	87	\|/ Successors: 3:d004c8f274b9
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	88	\| semi-colon: 3:d004c8f274b9
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	89	\| Fate: rewritten using amend as 3:d004c8f274b9 by test, test2
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	90	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	91	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	92
3050 6603d5655192 obsfate: add a test with user both current and other Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3049 diff changeset	93
6603d5655192 obsfate: add a test with user both current and other Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3049 diff changeset	94	$ hg log -G
3057 cb8ae3cb0bbc branching: merge with stable Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3042 3052 diff changeset	95	o changeset: 3:d004c8f274b9
3050 6603d5655192 obsfate: add a test with user both current and other Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3049 diff changeset	96	\| tag: tip
6603d5655192 obsfate: add a test with user both current and other Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3049 diff changeset	97	\| parent: 0:ea207398892e
6603d5655192 obsfate: add a test with user both current and other Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3049 diff changeset	98	\| user: test
6603d5655192 obsfate: add a test with user both current and other Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3049 diff changeset	99	\| date: Thu Jan 01 00:00:00 1970 +0000
6603d5655192 obsfate: add a test with user both current and other Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3049 diff changeset	100	\| summary: A2
6603d5655192 obsfate: add a test with user both current and other Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3049 diff changeset	101	\|
6603d5655192 obsfate: add a test with user both current and other Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3049 diff changeset	102	\| @ changeset: 1:471f378eab4c
6603d5655192 obsfate: add a test with user both current and other Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3049 diff changeset	103	\|/ user: test
6603d5655192 obsfate: add a test with user both current and other Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3049 diff changeset	104	\| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	105	\| obsolete: rewritten using amend as 3:d004c8f274b9 by test, test2
3050 6603d5655192 obsfate: add a test with user both current and other Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3049 diff changeset	106	\| summary: A0
6603d5655192 obsfate: add a test with user both current and other Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3049 diff changeset	107	\|
6603d5655192 obsfate: add a test with user both current and other Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3049 diff changeset	108	o changeset: 0:ea207398892e
6603d5655192 obsfate: add a test with user both current and other Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3049 diff changeset	109	user: test
6603d5655192 obsfate: add a test with user both current and other Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3049 diff changeset	110	date: Thu Jan 01 00:00:00 1970 +0000
6603d5655192 obsfate: add a test with user both current and other Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3049 diff changeset	111	summary: ROOT
6603d5655192 obsfate: add a test with user both current and other Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3049 diff changeset	112
6603d5655192 obsfate: add a test with user both current and other Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3049 diff changeset	113
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	114	$ hg fatelog -q
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	115	o d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	116	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	117	\| @ 471f378eab4c
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	118	\|/ Obsfate: rewritten using amend as 3:d004c8f274b9
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	119	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	120	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	121
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	122
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	123	$ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	124	o d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	125	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	126	\| @ 471f378eab4c
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	127	\|/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	128	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	129	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	130
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	131	$ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	132	o d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	133	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	134	\| @ 471f378eab4c
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	135	\|/ Obsfate: rewritten using amend as 3:d004c8f274b9 by test, test2 (between 2001-04-19 04:25 +0000 and 2009-02-13 23:31 +0000)
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	136	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	137	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	138
2599 df4a1b02308f template: used hex-node for the precursors underlying data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2591 diff changeset	139
df4a1b02308f template: used hex-node for the precursors underlying data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2591 diff changeset	140	(check json)
df4a1b02308f template: used hex-node for the precursors underlying data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2591 diff changeset	141
df4a1b02308f template: used hex-node for the precursors underlying data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2591 diff changeset	142	$ hg log -GT '{precursors\|json}\n'
df4a1b02308f template: used hex-node for the precursors underlying data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2591 diff changeset	143	o ["471f378eab4c5e25f6c77f785b27c936efb22874"]
df4a1b02308f template: used hex-node for the precursors underlying data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2591 diff changeset	144	\|
df4a1b02308f template: used hex-node for the precursors underlying data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2591 diff changeset	145	\| @ []
df4a1b02308f template: used hex-node for the precursors underlying data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2591 diff changeset	146	\|/
df4a1b02308f template: used hex-node for the precursors underlying data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2591 diff changeset	147	o []
df4a1b02308f template: used hex-node for the precursors underlying data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2591 diff changeset	148
df4a1b02308f template: used hex-node for the precursors underlying data Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2591 diff changeset	149
2602 31d3be16e65c template: use hex-node in successors Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2599 diff changeset	150	$ hg log -GT '{successors\|json}\n'
31d3be16e65c template: use hex-node in successors Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2599 diff changeset	151	o ""
31d3be16e65c template: use hex-node in successors Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2599 diff changeset	152	\|
31d3be16e65c template: use hex-node in successors Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2599 diff changeset	153	\| @ [["d004c8f274b9ec480a47a93c10dac5eee63adb78"]]
31d3be16e65c template: use hex-node in successors Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2599 diff changeset	154	\|/
31d3be16e65c template: use hex-node in successors Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2599 diff changeset	155	o ""
31d3be16e65c template: use hex-node in successors Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2599 diff changeset	156
31d3be16e65c template: use hex-node in successors Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2599 diff changeset	157
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	158	$ hg up 'desc(A1)' --hidden
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	159	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	160	updated to hidden changeset a468dc9b3633
3432 f57be161f34b test: update with new 'update' hint about obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3431 diff changeset	161	(hidden revision 'a468dc9b3633' was rewritten as: d004c8f274b9)
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	162	working directory parent is obsolete! (a468dc9b3633)
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	163	(use 'hg evolve' to update to its successor: d004c8f274b9)
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	164
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	165	Precursors template should show current revision as it is the working copy
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	166	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	167	o d004c8f274b9
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	168	\| Precursors: 2:a468dc9b3633
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	169	\| semi-colon: 2:a468dc9b3633
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	170	\| @ a468dc9b3633
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	171	\|/ Successors: 3:d004c8f274b9
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	172	\| semi-colon: 3:d004c8f274b9
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	173	\| Fate: reworded using amend as 3:d004c8f274b9 by test2
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	174	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	175	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	176
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	177	Precursors template should show the precursor as we force its display with
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	178	--hidden
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	179	$ hg tlog --hidden
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	180	o d004c8f274b9
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	181	\| Precursors: 2:a468dc9b3633
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	182	\| semi-colon: 2:a468dc9b3633
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	183	\| @ a468dc9b3633
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	184	\|/ Precursors: 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	185	\| semi-colon: 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	186	\| Successors: 3:d004c8f274b9
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	187	\| semi-colon: 3:d004c8f274b9
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	188	\| Fate: reworded using amend as 3:d004c8f274b9 by test2
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	189	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	190	\| x 471f378eab4c
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	191	\|/ Successors: 2:a468dc9b3633
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	192	\| semi-colon: 2:a468dc9b3633
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	193	\| Fate: rewritten using amend as 2:a468dc9b3633
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	194	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	195	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	196
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	197	$ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	198	o d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	199	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	200	\| @ a468dc9b3633
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	201	\|/ Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	202	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	203	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	204
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	205	$ hg up 'desc(A2)'
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	206	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	207	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	208	@ d004c8f274b9
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	209	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	210	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	211
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	212	$ hg tlog --hidden
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	213	@ d004c8f274b9
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	214	\| Precursors: 2:a468dc9b3633
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	215	\| semi-colon: 2:a468dc9b3633
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	216	\| x a468dc9b3633
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	217	\|/ Precursors: 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	218	\| semi-colon: 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	219	\| Successors: 3:d004c8f274b9
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	220	\| semi-colon: 3:d004c8f274b9
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	221	\| Fate: reworded using amend as 3:d004c8f274b9 by test2
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	222	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	223	\| x 471f378eab4c
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	224	\|/ Successors: 2:a468dc9b3633
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	225	\| semi-colon: 2:a468dc9b3633
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	226	\| Fate: rewritten using amend as 2:a468dc9b3633
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	227	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	228	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	229
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	230	$ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	231	@ d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	232	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	233	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	234
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	235
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	236	$ hg fatelog -v --hidden
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	237	@ d004c8f274b9
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	238	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	239	\| x a468dc9b3633
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	240	\|/ Obsfate: reworded using amend as 3:d004c8f274b9 by test2 (at 2001-04-19 04:25 +0000)
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	241	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	242	\| x 471f378eab4c
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	243	\|/ Obsfate: rewritten using amend as 2:a468dc9b3633 by test (at 2009-02-13 23:31 +0000)
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	244	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	245	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	246
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	247
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	248	Test templates with splitted commit
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	249	===================================
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	250
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	251	$ hg init $TESTTMP/templates-local-split
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	252	$ cd $TESTTMP/templates-local-split
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	253	$ mkcommit ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	254	$ echo 42 >> a
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	255	$ echo 43 >> b
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	256	$ hg commit -A -m "A0"
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	257	adding a
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	258	adding b
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	259	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	260	@ changeset: 1:471597cad322
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	261	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	262	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	263	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	264	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	265	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	266	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	267	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	268	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	269	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	270
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	271	$ hg split -r 'desc(A0)' -d "0 0" << EOF
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	272	> y
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	273	> y
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	274	> n
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	275	> n
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	276	> y
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	277	> y
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	278	> EOF
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	279	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	280	adding a
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	281	adding b
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	282	diff --git a/a b/a
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	283	new file mode 100644
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	284	examine changes to 'a'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	285
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	286	@@ -0,0 +1,1 @@
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	287	+42
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	288	record change 1/2 to 'a'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	289
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	290	diff --git a/b b/b
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	291	new file mode 100644
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	292	examine changes to 'b'? [Ynesfdaq?] n
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	293
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	294	created new head
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	295	Done splitting? [yN] n
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	296	diff --git a/b b/b
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	297	new file mode 100644
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	298	examine changes to 'b'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	299
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	300	@@ -0,0 +1,1 @@
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	301	+43
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	302	record this change to 'b'? [Ynesfdaq?] y
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	303
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	304	no more change to split
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	305
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	306	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	307	@ changeset: 3:f257fde29c7a
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	308	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	309	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	310	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	311	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	312	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	313	o changeset: 2:337fec4d2edc
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	314	\| parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	315	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	316	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	317	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	318	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	319	\| x changeset: 1:471597cad322
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	320	\|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	321	\| date: Thu Jan 01 00:00:00 1970 +0000
3567 5ddea3b8d2a4 split: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3566 diff changeset	322	\| obsolete: split using split as 2:337fec4d2edc, 3:f257fde29c7a
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	323	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	324	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	325	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	326	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	327	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	328	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	329
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	330
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	331	Check templates
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	332	---------------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	333
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	334	$ hg up 'obsolete()' --hidden
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	335	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	336	updated to hidden changeset 471597cad322
3432 f57be161f34b test: update with new 'update' hint about obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3431 diff changeset	337	(hidden revision '471597cad322' was split as: 337fec4d2edc, f257fde29c7a)
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	338	working directory parent is obsolete! (471597cad322)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	339	(use 'hg evolve' to update to its tipmost successor: 337fec4d2edc, f257fde29c7a)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	340
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	341	Precursors template should show current revision as it is the working copy
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	342	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	343	o f257fde29c7a
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	344	\| Precursors: 1:471597cad322
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	345	\| semi-colon: 1:471597cad322
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	346	o 337fec4d2edc
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	347	\| Precursors: 1:471597cad322
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	348	\| semi-colon: 1:471597cad322
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	349	\| @ 471597cad322
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	350	\|/ Successors: 2:337fec4d2edc 3:f257fde29c7a
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	351	\| semi-colon: 2:337fec4d2edc 3:f257fde29c7a
3567 5ddea3b8d2a4 split: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3566 diff changeset	352	\| Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	353	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	354	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	355
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	356	$ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	357	o f257fde29c7a
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	358	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	359	o 337fec4d2edc
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	360	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	361	\| @ 471597cad322
3567 5ddea3b8d2a4 split: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3566 diff changeset	362	\|/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	363	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	364	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	365
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	366
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	367	$ hg up f257fde29c7a
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	368	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	369
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	370	Precursors template should not show a precursor as it's not displayed in the
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	371	log
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	372	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	373	@ f257fde29c7a
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	374	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	375	o 337fec4d2edc
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	376	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	377	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	378
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	379	Precursors template should show the precursor as we force its display with
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	380	--hidden
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	381	$ hg tlog --hidden
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	382	@ f257fde29c7a
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	383	\| Precursors: 1:471597cad322
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	384	\| semi-colon: 1:471597cad322
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	385	o 337fec4d2edc
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	386	\| Precursors: 1:471597cad322
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	387	\| semi-colon: 1:471597cad322
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	388	\| x 471597cad322
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	389	\|/ Successors: 2:337fec4d2edc 3:f257fde29c7a
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	390	\| semi-colon: 2:337fec4d2edc 3:f257fde29c7a
3567 5ddea3b8d2a4 split: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3566 diff changeset	391	\| Fate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	392	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	393	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	394
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	395	$ hg fatelog --hidden
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	396	@ f257fde29c7a
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	397	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	398	o 337fec4d2edc
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	399	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	400	\| x 471597cad322
3567 5ddea3b8d2a4 split: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3566 diff changeset	401	\|/ Obsfate: split using split as 2:337fec4d2edc, 3:f257fde29c7a
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	402	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	403	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	404
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	405
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	406	Test templates with folded commit
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	407	==============================
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	408
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	409	Test setup
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	410	----------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	411
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	412	$ hg init $TESTTMP/templates-local-fold
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	413	$ cd $TESTTMP/templates-local-fold
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	414	$ mkcommit ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	415	$ mkcommit A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	416	$ mkcommit B0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	417	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	418	@ changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	419	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	420	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	421	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	422	\| summary: B0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	423	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	424	o changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	425	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	426	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	427	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	428	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	429	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	430	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	431	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	432	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	433
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	434	$ hg fold --exact -r 'desc(A0) + desc(B0)' --date "0 0" -m "C0"
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	435	2 changesets folded
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	436	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	437	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	438	@ changeset: 3:eb5a0daa2192
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	439	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	440	\| parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	441	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	442	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	443	\| summary: C0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	444	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	445	\| x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	446	\| \| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	447	\| \| date: Thu Jan 01 00:00:00 1970 +0000
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	448	\| \| obsolete: rewritten using fold as 3:eb5a0daa2192
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	449	\| \| summary: B0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	450	\| \|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	451	\| x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	452	\|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	453	\| date: Thu Jan 01 00:00:00 1970 +0000
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	454	\| obsolete: rewritten using fold as 3:eb5a0daa2192
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	455	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	456	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	457	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	458	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	459	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	460	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	461
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	462	Check templates
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	463	---------------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	464
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	465	$ hg up 'desc(A0)' --hidden
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	466	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	467	updated to hidden changeset 471f378eab4c
3432 f57be161f34b test: update with new 'update' hint about obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3431 diff changeset	468	(hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	469	working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	470	(use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	471
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	472	Precursors template should show current revision as it is the working copy
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	473	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	474	o eb5a0daa2192
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	475	\| Precursors: 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	476	\| semi-colon: 1:471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	477	\| @ 471f378eab4c
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	478	\|/ Successors: 3:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	479	\| semi-colon: 3:eb5a0daa2192
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	480	\| Fate: rewritten using fold as 3:eb5a0daa2192
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	481	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	482	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	483
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	484	$ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	485	o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	486	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	487	\| @ 471f378eab4c
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	488	\|/ Obsfate: rewritten using fold as 3:eb5a0daa2192
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	489	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	490	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	491
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	492	$ hg up 'desc(B0)' --hidden
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	493	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	494	updated to hidden changeset 0dec01379d3b
3432 f57be161f34b test: update with new 'update' hint about obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3431 diff changeset	495	(hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	496	working directory parent is obsolete! (0dec01379d3b)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	497	(use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	498
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	499	Precursors template should show both precursors as they should be both
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	500	displayed
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	501	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	502	o eb5a0daa2192
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	503	\| Precursors: 2:0dec01379d3b 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	504	\| semi-colon: 2:0dec01379d3b; 1:471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	505	\| @ 0dec01379d3b
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	506	\| \| Successors: 3:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	507	\| \| semi-colon: 3:eb5a0daa2192
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	508	\| \| Fate: rewritten using fold as 3:eb5a0daa2192
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	509	\| \|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	510	\| x 471f378eab4c
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	511	\|/ Successors: 3:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	512	\| semi-colon: 3:eb5a0daa2192
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	513	\| Fate: rewritten using fold as 3:eb5a0daa2192
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	514	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	515	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	516
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	517	$ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	518	o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	519	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	520	\| @ 0dec01379d3b
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	521	\| \| Obsfate: rewritten using fold as 3:eb5a0daa2192
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	522	\| \|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	523	\| x 471f378eab4c
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	524	\|/ Obsfate: rewritten using fold as 3:eb5a0daa2192
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	525	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	526	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	527
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	528
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	529	$ hg up 'desc(C0)'
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	530	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	531
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	532	Precursors template should not show precursors as it's not displayed in the
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	533	log
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	534	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	535	@ eb5a0daa2192
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	536	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	537	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	538
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	539	Precursors template should show both precursors as we force its display with
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	540	--hidden
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	541	$ hg tlog --hidden
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	542	@ eb5a0daa2192
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	543	\| Precursors: 2:0dec01379d3b 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	544	\| semi-colon: 2:0dec01379d3b; 1:471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	545	\| x 0dec01379d3b
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	546	\| \| Successors: 3:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	547	\| \| semi-colon: 3:eb5a0daa2192
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	548	\| \| Fate: rewritten using fold as 3:eb5a0daa2192
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	549	\| \|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	550	\| x 471f378eab4c
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	551	\|/ Successors: 3:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	552	\| semi-colon: 3:eb5a0daa2192
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	553	\| Fate: rewritten using fold as 3:eb5a0daa2192
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	554	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	555	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	556
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	557	$ hg fatelog --hidden
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	558	@ eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	559	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	560	\| x 0dec01379d3b
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	561	\| \| Obsfate: rewritten using fold as 3:eb5a0daa2192
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	562	\| \|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	563	\| x 471f378eab4c
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	564	\|/ Obsfate: rewritten using fold as 3:eb5a0daa2192
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	565	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	566	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	567
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	568
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	569	Test templates with divergence
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	570	==============================
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	571
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	572	Test setup
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	573	----------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	574
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	575	$ hg init $TESTTMP/templates-local-divergence
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	576	$ cd $TESTTMP/templates-local-divergence
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	577	$ mkcommit ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	578	$ mkcommit A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	579	$ hg amend -m "A1"
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	580	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	581	@ changeset: 2:fdf9bde5129a
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	582	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	583	\| parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	584	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	585	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	586	\| summary: A1
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	587	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	588	\| x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	589	\|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	590	\| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	591	\| obsolete: reworded using amend as 2:fdf9bde5129a
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	592	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	593	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	594	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	595	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	596	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	597	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	598
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	599	$ hg update --hidden 'desc(A0)'
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	600	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	601	updated to hidden changeset 471f378eab4c
3432 f57be161f34b test: update with new 'update' hint about obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3431 diff changeset	602	(hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	603	working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	604	(use 'hg evolve' to update to its successor: fdf9bde5129a)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	605	$ hg amend -m "A2"
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	606	2 new content-divergent changesets
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	607	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	608	@ changeset: 3:65b757b745b9
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	609	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	610	\| parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	611	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	612	\| date: Thu Jan 01 00:00:00 1970 +0000
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	613	\| instability: content-divergent
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	614	\| summary: A2
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	615	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	616	\| * changeset: 2:fdf9bde5129a
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	617	\|/ parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	618	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	619	\| date: Thu Jan 01 00:00:00 1970 +0000
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	620	\| instability: content-divergent
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	621	\| summary: A1
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	622	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	623	\| x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	624	\|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	625	\| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	626	\| obsolete: reworded using amend as 2:fdf9bde5129a
663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	627	\| obsolete: reworded using amend as 3:65b757b745b9
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	628	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	629	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	630	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	631	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	632	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	633	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	634
2487 590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	635	$ hg amend -m 'A3'
590da9c523ae template: add successors template Boris Feld <boris.feld@octobus.net> parents: 2486 diff changeset	636
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	637	Check templates
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	638	---------------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	639
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	640	$ hg up 'desc(A0)' --hidden
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	641	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	642	updated to hidden changeset 471f378eab4c
3432 f57be161f34b test: update with new 'update' hint about obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3431 diff changeset	643	(hidden revision '471f378eab4c' has diverged)
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	644	working directory parent is obsolete! (471f378eab4c)
3154 406992d0d611 evolve: rename --contentdivergent flag to --content-divergent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3115 diff changeset	645	(471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	646
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	647	Precursors template should show current revision as it is the working copy
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	648	$ hg tlog
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	649	* 019fadeab383
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	650	\| Precursors: 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	651	\| semi-colon: 1:471f378eab4c
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	652	\| * fdf9bde5129a
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	653	\|/ Precursors: 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	654	\| semi-colon: 1:471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	655	\| @ 471f378eab4c
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	656	\|/ Successors: 2:fdf9bde5129a; 4:019fadeab383
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	657	\| semi-colon: 2:fdf9bde5129a; 4:019fadeab383
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	658	\| Fate: reworded using amend as 2:fdf9bde5129a
663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	659	\| Fate: reworded using amend as 4:019fadeab383
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	660	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	661	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	662
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	663	$ hg fatelog
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	664	* 019fadeab383
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	665	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	666	\| * fdf9bde5129a
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	667	\|/
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	668	\| @ 471f378eab4c
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	669	\|/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 4:019fadeab383
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	670	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	671	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	672
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	673
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	674	$ hg up 'desc(A1)'
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	675	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	676	Precursors template should not show precursors as it's not displayed in the
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	677	log
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	678	$ hg tlog
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	679	* 019fadeab383
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	680	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	681	\| @ fdf9bde5129a
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	682	\|/
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	683	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	684
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	685
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	686	$ hg fatelog
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	687	* 019fadeab383
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	688	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	689	\| @ fdf9bde5129a
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	690	\|/
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	691	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	692
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	693	Precursors template should a precursor as we force its display with --hidden
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	694	$ hg tlog --hidden
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	695	* 019fadeab383
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	696	\| Precursors: 3:65b757b745b9
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	697	\| semi-colon: 3:65b757b745b9
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	698	\| x 65b757b745b9
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	699	\|/ Precursors: 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	700	\| semi-colon: 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	701	\| Successors: 4:019fadeab383
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	702	\| semi-colon: 4:019fadeab383
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	703	\| Fate: reworded using amend as 4:019fadeab383
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	704	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	705	\| @ fdf9bde5129a
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	706	\|/ Precursors: 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	707	\| semi-colon: 1:471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	708	\| x 471f378eab4c
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	709	\|/ Successors: 2:fdf9bde5129a; 3:65b757b745b9
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	710	\| semi-colon: 2:fdf9bde5129a; 3:65b757b745b9
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	711	\| Fate: reworded using amend as 2:fdf9bde5129a
663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	712	\| Fate: reworded using amend as 3:65b757b745b9
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	713	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	714	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	715
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	716	$ hg fatelog --hidden
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	717	* 019fadeab383
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	718	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	719	\| x 65b757b745b9
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	720	\|/ Obsfate: reworded using amend as 4:019fadeab383
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	721	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	722	\| @ fdf9bde5129a
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	723	\|/
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	724	\| x 471f378eab4c
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	725	\|/ Obsfate: reworded using amend as 2:fdf9bde5129a; reworded using amend as 3:65b757b745b9
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	726	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	727	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	728
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	729
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	730	Test templates with amended + folded commit
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	731	===========================================
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	732
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	733	Test setup
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	734	----------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	735
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	736	$ hg init $TESTTMP/templates-local-amend-fold
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	737	$ cd $TESTTMP/templates-local-amend-fold
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	738	$ mkcommit ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	739	$ mkcommit A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	740	$ mkcommit B0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	741	$ hg amend -m "B1"
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	742	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	743	@ changeset: 3:b7ea6d14e664
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	744	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	745	\| parent: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	746	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	747	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	748	\| summary: B1
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	749	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	750	\| x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	751	\|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	752	\| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	753	\| obsolete: reworded using amend as 3:b7ea6d14e664
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	754	\| summary: B0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	755	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	756	o changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	757	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	758	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	759	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	760	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	761	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	762	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	763	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	764	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	765
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	766	$ hg fold --exact -r 'desc(A0) + desc(B1)' --date "0 0" -m "C0"
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	767	2 changesets folded
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	768	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	769	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	770	@ changeset: 4:eb5a0daa2192
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	771	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	772	\| parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	773	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	774	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	775	\| summary: C0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	776	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	777	\| x changeset: 3:b7ea6d14e664
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	778	\| \| parent: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	779	\| \| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	780	\| \| date: Thu Jan 01 00:00:00 1970 +0000
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	781	\| \| obsolete: rewritten using fold as 4:eb5a0daa2192
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	782	\| \| summary: B1
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	783	\| \|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	784	\| \| x changeset: 2:0dec01379d3b
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	785	\| \|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	786	\| \| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	787	\| \| obsolete: reworded using amend as 3:b7ea6d14e664
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	788	\| \| summary: B0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	789	\| \|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	790	\| x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	791	\|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	792	\| date: Thu Jan 01 00:00:00 1970 +0000
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	793	\| obsolete: rewritten using fold as 4:eb5a0daa2192
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	794	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	795	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	796	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	797	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	798	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	799	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	800
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	801	Check templates
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	802	---------------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	803
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	804	$ hg up 'desc(A0)' --hidden
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	805	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	806	updated to hidden changeset 471f378eab4c
3432 f57be161f34b test: update with new 'update' hint about obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3431 diff changeset	807	(hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	808	working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	809	(use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	810	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	811	o eb5a0daa2192
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	812	\| Precursors: 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	813	\| semi-colon: 1:471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	814	\| @ 471f378eab4c
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	815	\|/ Successors: 4:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	816	\| semi-colon: 4:eb5a0daa2192
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	817	\| Fate: rewritten using fold as 4:eb5a0daa2192
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	818	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	819	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	820
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	821	$ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	822	o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	823	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	824	\| @ 471f378eab4c
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	825	\|/ Obsfate: rewritten using fold as 4:eb5a0daa2192
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	826	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	827	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	828
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	829	$ hg up 'desc(B0)' --hidden
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	830	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	831	updated to hidden changeset 0dec01379d3b
3432 f57be161f34b test: update with new 'update' hint about obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3431 diff changeset	832	(hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	833	working directory parent is obsolete! (0dec01379d3b)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	834	(use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	835	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	836	o eb5a0daa2192
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	837	\| Precursors: 2:0dec01379d3b 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	838	\| semi-colon: 2:0dec01379d3b; 1:471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	839	\| @ 0dec01379d3b
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	840	\| \| Successors: 4:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	841	\| \| semi-colon: 4:eb5a0daa2192
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	842	\| \| Fate: rewritten using amend, fold as 4:eb5a0daa2192
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	843	\| \|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	844	\| x 471f378eab4c
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	845	\|/ Successors: 4:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	846	\| semi-colon: 4:eb5a0daa2192
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	847	\| Fate: rewritten using fold as 4:eb5a0daa2192
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	848	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	849	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	850
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	851	$ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	852	o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	853	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	854	\| @ 0dec01379d3b
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	855	\| \| Obsfate: rewritten using amend, fold as 4:eb5a0daa2192
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	856	\| \|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	857	\| x 471f378eab4c
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	858	\|/ Obsfate: rewritten using fold as 4:eb5a0daa2192
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	859	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	860	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	861
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	862
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	863	$ hg up 'desc(B1)' --hidden
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	864	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	865	updated to hidden changeset b7ea6d14e664
3432 f57be161f34b test: update with new 'update' hint about obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3431 diff changeset	866	(hidden revision 'b7ea6d14e664' was rewritten as: eb5a0daa2192)
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	867	working directory parent is obsolete! (b7ea6d14e664)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	868	(use 'hg evolve' to update to its successor: eb5a0daa2192)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	869	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	870	o eb5a0daa2192
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	871	\| Precursors: 1:471f378eab4c 3:b7ea6d14e664
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	872	\| semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	873	\| @ b7ea6d14e664
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	874	\| \| Successors: 4:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	875	\| \| semi-colon: 4:eb5a0daa2192
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	876	\| \| Fate: rewritten using fold as 4:eb5a0daa2192
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	877	\| \|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	878	\| x 471f378eab4c
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	879	\|/ Successors: 4:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	880	\| semi-colon: 4:eb5a0daa2192
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	881	\| Fate: rewritten using fold as 4:eb5a0daa2192
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	882	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	883	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	884
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	885	$ hg fatelog
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	886	o eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	887	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	888	\| @ b7ea6d14e664
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	889	\| \| Obsfate: rewritten using fold as 4:eb5a0daa2192
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	890	\| \|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	891	\| x 471f378eab4c
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	892	\|/ Obsfate: rewritten using fold as 4:eb5a0daa2192
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	893	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	894	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	895
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	896
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	897	$ hg up 'desc(C0)'
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	898	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	899	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	900	@ eb5a0daa2192
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	901	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	902	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	903
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	904	$ hg tlog --hidden
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	905	@ eb5a0daa2192
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	906	\| Precursors: 1:471f378eab4c 3:b7ea6d14e664
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	907	\| semi-colon: 1:471f378eab4c; 3:b7ea6d14e664
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	908	\| x b7ea6d14e664
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	909	\| \| Precursors: 2:0dec01379d3b
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	910	\| \| semi-colon: 2:0dec01379d3b
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	911	\| \| Successors: 4:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	912	\| \| semi-colon: 4:eb5a0daa2192
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	913	\| \| Fate: rewritten using fold as 4:eb5a0daa2192
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	914	\| \|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	915	\| \| x 0dec01379d3b
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	916	\| \|/ Successors: 3:b7ea6d14e664
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	917	\| \| semi-colon: 3:b7ea6d14e664
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	918	\| \| Fate: reworded using amend as 3:b7ea6d14e664
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	919	\| \|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	920	\| x 471f378eab4c
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	921	\|/ Successors: 4:eb5a0daa2192
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	922	\| semi-colon: 4:eb5a0daa2192
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	923	\| Fate: rewritten using fold as 4:eb5a0daa2192
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	924	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	925	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	926
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	927	$ hg fatelog --hidden
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	928	@ eb5a0daa2192
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	929	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	930	\| x b7ea6d14e664
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	931	\| \| Obsfate: rewritten using fold as 4:eb5a0daa2192
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	932	\| \|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	933	\| \| x 0dec01379d3b
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	934	\| \|/ Obsfate: reworded using amend as 3:b7ea6d14e664
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	935	\| \|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	936	\| x 471f378eab4c
3564 589649021ea1 fold: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3520 diff changeset	937	\|/ Obsfate: rewritten using fold as 4:eb5a0daa2192
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	938	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	939	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	940
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	941
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	942	Test template with pushed and pulled obs markers
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	943	==============================================
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	944
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	945	Test setup
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	946	----------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	947
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	948	$ hg init $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	949	$ cd $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	950	$ mkcommit ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	951	$ mkcommit A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	952	$ hg clone $TESTTMP/templates-local-remote-markers-1 $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	953	updating to branch default
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	954	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	955	$ cd $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	956	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	957	@ changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	958	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	959	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	960	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	961	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	962	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	963	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	964	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	965	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	966	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	967
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	968	$ cd $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	969	$ hg amend -m "A1"
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	970	$ hg amend -m "A2"
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	971	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	972	@ changeset: 3:7a230b46bf61
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	973	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	974	\| parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	975	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	976	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	977	\| summary: A2
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	978	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	979	\| x changeset: 2:fdf9bde5129a
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	980	\|/ parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	981	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	982	\| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	983	\| obsolete: reworded using amend as 3:7a230b46bf61
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	984	\| summary: A1
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	985	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	986	\| x changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	987	\|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	988	\| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	989	\| obsolete: reworded using amend as 2:fdf9bde5129a
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	990	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	991	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	992	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	993	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	994	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	995	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	996
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	997	$ cd $TESTTMP/templates-local-remote-markers-2
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	998	$ hg pull
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	999	pulling from $TESTTMP/templates-local-remote-markers-1
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1000	searching for changes
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1001	adding changesets
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1002	adding manifests
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1003	adding file changes
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1004	added 1 changesets with 0 changes to 1 files (+1 heads)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1005	2 new obsolescence markers
2710 e22de367fc74 compat: adapt to change in 53b3a1968aa6-core Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2709 diff changeset	1006	obsoleted 1 changesets
4202 f555039d1a08 branching: revert test outptu change for 4.7 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4197 diff changeset	1007	new changesets 7a230b46bf61
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1008	(run 'hg heads' to see heads, 'hg merge' to merge)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1009	working directory parent is obsolete! (471f378eab4c)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1010	(use 'hg evolve' to update to its successor: 7a230b46bf61)
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1011	$ hg log --hidden -G
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1012	o changeset: 2:7a230b46bf61
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1013	\| tag: tip
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1014	\| parent: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1015	\| user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1016	\| date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1017	\| summary: A2
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1018	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1019	\| @ changeset: 1:471f378eab4c
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1020	\|/ user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1021	\| date: Thu Jan 01 00:00:00 1970 +0000
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1022	\| obsolete: reworded using amend as 2:7a230b46bf61
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1023	\| summary: A0
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1024	\|
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1025	o changeset: 0:ea207398892e
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1026	user: test
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1027	date: Thu Jan 01 00:00:00 1970 +0000
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1028	summary: ROOT
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1029
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1030	Check templates
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1031	---------------
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1032
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1033	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	1034	o 7a230b46bf61
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	1035	\| Precursors: 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	1036	\| semi-colon: 1:471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	1037	\| @ 471f378eab4c
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	1038	\|/ Successors: 2:7a230b46bf61
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	1039	\| semi-colon: 2:7a230b46bf61
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1040	\| Fate: reworded using amend as 2:7a230b46bf61
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	1041	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	1042	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	1043
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1044	$ hg fatelog --hidden -v
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1045	o 7a230b46bf61
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1046	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1047	\| @ 471f378eab4c
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1048	\|/ Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	1049	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1050	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1051
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1052	$ hg up 'desc(A2)'
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1053	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1054	$ hg tlog
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	1055	@ 7a230b46bf61
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	1056	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	1057	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	1058
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1059	$ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1060	@ 7a230b46bf61
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1061	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1062	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1063
2486 cd4290f923b7 template: add precursors template Boris Feld <boris.feld@octobus.net> parents: diff changeset	1064	$ hg tlog --hidden
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	1065	@ 7a230b46bf61
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	1066	\| Precursors: 1:471f378eab4c
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	1067	\| semi-colon: 1:471f378eab4c
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	1068	\| x 471f378eab4c
3083 e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	1069	\|/ Successors: 2:7a230b46bf61
e91ca8b5ecf7 obsfate: use core version of obsfate if available Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3057 diff changeset	1070	\| semi-colon: 2:7a230b46bf61
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1071	\| Fate: reworded using amend as 2:7a230b46bf61
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	1072	\|
2495 0db53f48db2d template: move each template on its own line during tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2494 diff changeset	1073	o ea207398892e
2499 8abc7066e384 template: skip "fate" in test output when empty Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2498 diff changeset	1074
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1075	$ hg fatelog --hidden -v
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1076	@ 7a230b46bf61
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1077	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1078	\| x 471f378eab4c
3115 663dbef40f97 obsfate: re-enables operation display in obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3083 diff changeset	1079	\|/ Obsfate: reworded using amend as 2:7a230b46bf61 by test (at 1970-01-01 00:00 +0000)
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	1080	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1081	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1082
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1083
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1084	Test template with obsmarkers cycle
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1085	===================================
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1086
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1087	Test setup
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1088	----------
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1089
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1090	$ hg init $TESTTMP/templates-local-cycle
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1091	$ cd $TESTTMP/templates-local-cycle
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1092	$ mkcommit ROOT
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1093	$ mkcommit A0
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1094	$ mkcommit B0
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1095	$ hg up -r 0
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1096	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1097	$ mkcommit C0
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1098	created new head
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1099
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1100	Create the cycle
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1101
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1102	$ hg debugobsolete `getid "desc(A0)"` `getid "desc(B0)"`
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1103	obsoleted 1 changesets
3431 2e703ed1c713 evolve: update output for wider reporting of troubled changesets Martin von Zweigbergk <martinvonz@google.com> parents: 3417 diff changeset	1104	1 new orphan changesets
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1105	$ hg debugobsolete `getid "desc(B0)"` `getid "desc(C0)"`
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1106	obsoleted 1 changesets
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1107	$ hg debugobsolete `getid "desc(B0)"` `getid "desc(A0)"`
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1108
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1109	Check templates
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1110	---------------
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1111
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1112	$ hg tlog
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1113	@ f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1114	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1115	o ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1116
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1117	$ hg fatelog
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1118	@ f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1119	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1120	o ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1121
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1122	$ hg up -r "desc(B0)" --hidden
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	1123	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	1124	updated to hidden changeset 0dec01379d3b
3432 f57be161f34b test: update with new 'update' hint about obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3431 diff changeset	1125	(hidden revision '0dec01379d3b' is pruned)
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1126	working directory parent is obsolete! (0dec01379d3b)
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1127	(use 'hg evolve' to update to its parent successor)
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1128	$ hg tlog
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1129	o f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1130	\| Precursors: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1131	\| semi-colon: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1132	\| @ 0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1133	\| \| Precursors: 1:471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1134	\| \| semi-colon: 1:471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1135	\| \| Successors: 3:f897c6137566; 1:471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1136	\| \| semi-colon: 3:f897c6137566; 1:471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1137	\| \| Fate: rewritten as 3:f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1138	\| \| Fate: rewritten as 1:471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1139	\| \|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1140	\| x 471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1141	\|/ Precursors: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1142	\| semi-colon: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1143	\| Successors: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1144	\| semi-colon: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1145	\| Fate: rewritten as 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1146	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1147	o ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1148
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1149	$ hg fatelog
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1150	o f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1151	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1152	\| @ 0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1153	\| \| Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1154	\| \|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1155	\| x 471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1156	\|/ Obsfate: rewritten as 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1157	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1158	o ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1159
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1160	$ hg up -r "desc(A0)" --hidden
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1161	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1162	working directory parent is obsolete! (471f378eab4c)
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1163	(use 'hg evolve' to update to its parent successor)
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1164	$ hg tlog
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1165	o f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1166	\| Precursors: 1:471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1167	\| semi-colon: 1:471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1168	\| @ 471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1169	\|/ Fate: pruned
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1170	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1171	o ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1172
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1173	$ hg fatelog
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1174	o f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1175	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1176	\| @ 471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1177	\|/ Obsfate: pruned
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1178	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1179	o ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1180
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1181
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1182	$ hg up -r "desc(ROOT)" --hidden
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1183	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1184	$ hg tlog
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1185	o f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1186	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1187	@ ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1188
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1189	$ hg fatelog
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1190	o f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1191	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1192	@ ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1193
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1194	$ hg tlog --hidden
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1195	o f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1196	\| Precursors: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1197	\| semi-colon: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1198	\| x 0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1199	\| \| Precursors: 1:471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1200	\| \| semi-colon: 1:471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1201	\| \| Successors: 3:f897c6137566; 1:471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1202	\| \| semi-colon: 3:f897c6137566; 1:471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1203	\| \| Fate: rewritten as 3:f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1204	\| \| Fate: rewritten as 1:471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1205	\| \|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1206	\| x 471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1207	\|/ Precursors: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1208	\| semi-colon: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1209	\| Successors: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1210	\| semi-colon: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1211	\| Fate: rewritten as 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1212	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1213	@ ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1214
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1215	Test template with split + divergence with cycles
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1216	=================================================
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1217
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1218	$ hg log -G
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1219	o changeset: 3:f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1220	\| tag: tip
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1221	\| parent: 0:ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1222	\| user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1223	\| date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1224	\| summary: C0
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1225	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1226	@ changeset: 0:ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1227	user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1228	date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1229	summary: ROOT
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1230
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1231	$ hg up
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1232	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1233
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1234	Create a commit with three files
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1235	$ touch A B C
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1236	$ hg commit -A -m "Add A,B,C" A B C
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1237
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1238	Split it
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1239	$ hg up 3
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1240	0 files updated, 0 files merged, 3 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1241	$ touch A
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1242	$ hg commit -A -m "Add A,B,C" A
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1243	created new head
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1244
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1245	$ touch B
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1246	$ hg commit -A -m "Add A,B,C" B
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1247
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1248	$ touch C
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1249	$ hg commit -A -m "Add A,B,C" C
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1250
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1251	$ hg log -G
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1252	@ changeset: 7:ba2ed02b0c9a
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1253	\| tag: tip
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1254	\| user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1255	\| date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1256	\| summary: Add A,B,C
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1257	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1258	o changeset: 6:4a004186e638
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1259	\| user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1260	\| date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1261	\| summary: Add A,B,C
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1262	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1263	o changeset: 5:dd800401bd8c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1264	\| parent: 3:f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1265	\| user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1266	\| date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1267	\| summary: Add A,B,C
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1268	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1269	\| o changeset: 4:9bd10a0775e4
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1270	\|/ user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1271	\| date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1272	\| summary: Add A,B,C
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1273	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1274	o changeset: 3:f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1275	\| parent: 0:ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1276	\| user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1277	\| date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1278	\| summary: C0
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1279	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1280	o changeset: 0:ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1281	user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1282	date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1283	summary: ROOT
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1284
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1285	$ hg debugobsolete `getid "4"` `getid "5"` `getid "6"` `getid "7"`
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1286	obsoleted 1 changesets
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1287	$ hg log -G
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1288	@ changeset: 7:ba2ed02b0c9a
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1289	\| tag: tip
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1290	\| user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1291	\| date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1292	\| summary: Add A,B,C
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1293	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1294	o changeset: 6:4a004186e638
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1295	\| user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1296	\| date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1297	\| summary: Add A,B,C
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1298	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1299	o changeset: 5:dd800401bd8c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1300	\| parent: 3:f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1301	\| user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1302	\| date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1303	\| summary: Add A,B,C
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1304	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1305	o changeset: 3:f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1306	\| parent: 0:ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1307	\| user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1308	\| date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1309	\| summary: C0
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1310	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1311	o changeset: 0:ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1312	user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1313	date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1314	summary: ROOT
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1315
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1316	Diverge one of the splitted commit
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1317
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1318	$ hg up 6
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1319	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1320	$ hg commit --amend -m "Add only B"
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1321	1 new orphan changesets
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1322
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1323	$ hg up 6 --hidden
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1324	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1325	working directory parent is obsolete! (4a004186e638)
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1326	(use 'hg evolve' to update to its successor: b18bc8331526)
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1327	$ hg commit --amend -m "Add B only"
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1328	4 new content-divergent changesets
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1329
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1330	$ hg log -G
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1331	@ changeset: 9:0b997eb7ceee
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1332	\| tag: tip
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1333	\| parent: 5:dd800401bd8c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1334	\| user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1335	\| date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1336	\| instability: content-divergent
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1337	\| summary: Add B only
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1338	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1339	\| * changeset: 8:b18bc8331526
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1340	\|/ parent: 5:dd800401bd8c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1341	\| user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1342	\| date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1343	\| instability: content-divergent
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1344	\| summary: Add only B
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1345	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1346	\| * changeset: 7:ba2ed02b0c9a
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1347	\| \| user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1348	\| \| date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1349	\| \| instability: orphan, content-divergent
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1350	\| \| summary: Add A,B,C
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1351	\| \|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1352	\| x changeset: 6:4a004186e638
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1353	\|/ user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1354	\| date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1355	\| obsolete: reworded using amend as 8:b18bc8331526
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1356	\| obsolete: reworded using amend as 9:0b997eb7ceee
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1357	\| summary: Add A,B,C
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1358	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1359	* changeset: 5:dd800401bd8c
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1360	\| parent: 3:f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1361	\| user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1362	\| date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1363	\| instability: content-divergent
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1364	\| summary: Add A,B,C
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1365	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1366	o changeset: 3:f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1367	\| parent: 0:ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1368	\| user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1369	\| date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1370	\| summary: C0
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1371	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1372	o changeset: 0:ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1373	user: test
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1374	date: Thu Jan 01 00:00:00 1970 +0000
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1375	summary: ROOT
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1376
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1377	Check templates
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1378	---------------
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1379
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1380	$ hg tlog
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1381	@ 0b997eb7ceee
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1382	\| Precursors: 6:4a004186e638
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1383	\| semi-colon: 6:4a004186e638
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1384	\| * b18bc8331526
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1385	\|/ Precursors: 6:4a004186e638
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1386	\| semi-colon: 6:4a004186e638
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1387	\| * ba2ed02b0c9a
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1388	\| \|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1389	\| x 4a004186e638
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1390	\|/ Successors: 8:b18bc8331526; 9:0b997eb7ceee
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1391	\| semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1392	\| Fate: reworded using amend as 8:b18bc8331526
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1393	\| Fate: reworded using amend as 9:0b997eb7ceee
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1394	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1395	* dd800401bd8c
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1396	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1397	o f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1398	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1399	o ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1400
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1401	$ hg fatelog
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1402	@ 0b997eb7ceee
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1403	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1404	\| * b18bc8331526
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1405	\|/
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1406	\| * ba2ed02b0c9a
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1407	\| \|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1408	\| x 4a004186e638
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1409	\|/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1410	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1411	* dd800401bd8c
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1412	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1413	o f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1414	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1415	o ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1416
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1417	$ hg tlog --hidden
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1418	@ 0b997eb7ceee
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1419	\| Precursors: 6:4a004186e638
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1420	\| semi-colon: 6:4a004186e638
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1421	\| * b18bc8331526
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1422	\|/ Precursors: 6:4a004186e638
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1423	\| semi-colon: 6:4a004186e638
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1424	\| * ba2ed02b0c9a
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1425	\| \| Precursors: 4:9bd10a0775e4
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1426	\| \| semi-colon: 4:9bd10a0775e4
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1427	\| x 4a004186e638
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1428	\|/ Precursors: 4:9bd10a0775e4
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1429	\| semi-colon: 4:9bd10a0775e4
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1430	\| Successors: 8:b18bc8331526; 9:0b997eb7ceee
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1431	\| semi-colon: 8:b18bc8331526; 9:0b997eb7ceee
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1432	\| Fate: reworded using amend as 8:b18bc8331526
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1433	\| Fate: reworded using amend as 9:0b997eb7ceee
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1434	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1435	* dd800401bd8c
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1436	\| Precursors: 4:9bd10a0775e4
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1437	\| semi-colon: 4:9bd10a0775e4
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1438	\| x 9bd10a0775e4
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1439	\|/ Successors: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1440	\| semi-colon: 5:dd800401bd8c 6:4a004186e638 7:ba2ed02b0c9a
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1441	\| Fate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1442	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1443	o f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1444	\| Precursors: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1445	\| semi-colon: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1446	\| x 0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1447	\| \| Precursors: 1:471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1448	\| \| semi-colon: 1:471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1449	\| \| Successors: 3:f897c6137566; 1:471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1450	\| \| semi-colon: 3:f897c6137566; 1:471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1451	\| \| Fate: rewritten as 3:f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1452	\| \| Fate: rewritten as 1:471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1453	\| \|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1454	\| x 471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1455	\|/ Precursors: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1456	\| semi-colon: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1457	\| Successors: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1458	\| semi-colon: 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1459	\| Fate: rewritten as 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1460	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1461	o ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1462
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1463	$ hg fatelog --hidden
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1464	@ 0b997eb7ceee
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1465	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1466	\| * b18bc8331526
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1467	\|/
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1468	\| * ba2ed02b0c9a
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1469	\| \|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1470	\| x 4a004186e638
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1471	\|/ Obsfate: reworded using amend as 8:b18bc8331526; reworded using amend as 9:0b997eb7ceee
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1472	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1473	* dd800401bd8c
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1474	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1475	\| x 9bd10a0775e4
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1476	\|/ Obsfate: split as 5:dd800401bd8c, 6:4a004186e638, 7:ba2ed02b0c9a
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1477	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1478	o f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1479	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1480	\| x 0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1481	\| \| Obsfate: rewritten as 3:f897c6137566; rewritten as 1:471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1482	\| \|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1483	\| x 471f378eab4c
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1484	\|/ Obsfate: rewritten as 2:0dec01379d3b
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1485	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1486	o ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1487
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1488	$ hg up --hidden 4
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	1489	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	1490	updated to hidden changeset 9bd10a0775e4
3432 f57be161f34b test: update with new 'update' hint about obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3431 diff changeset	1491	(hidden revision '9bd10a0775e4' has diverged)
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1492	working directory parent is obsolete! (9bd10a0775e4)
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1493	(9bd10a0775e4 has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1494	$ hg rebase -r 7 -d 8 --config extensions.rebase=
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1495	rebasing 7:ba2ed02b0c9a "Add A,B,C"
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1496	$ hg tlog
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1497	* eceed8f98ffc
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1498	\| Precursors: 4:9bd10a0775e4
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1499	\| semi-colon: 4:9bd10a0775e4
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1500	\| * 0b997eb7ceee
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1501	\| \| Precursors: 4:9bd10a0775e4
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1502	\| \| semi-colon: 4:9bd10a0775e4
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1503	* \| b18bc8331526
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1504	\|/ Precursors: 4:9bd10a0775e4
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1505	\| semi-colon: 4:9bd10a0775e4
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1506	* dd800401bd8c
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1507	\| Precursors: 4:9bd10a0775e4
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1508	\| semi-colon: 4:9bd10a0775e4
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1509	\| @ 9bd10a0775e4
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1510	\|/ Successors: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1511	\| semi-colon: 5:dd800401bd8c 9:0b997eb7ceee 10:eceed8f98ffc; 5:dd800401bd8c 8:b18bc8331526 10:eceed8f98ffc
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1512	\| Fate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1513	\| Fate: split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1514	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1515	o f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1516	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1517	o ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1518
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1519	$ hg fatelog
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1520	* eceed8f98ffc
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1521	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1522	\| * 0b997eb7ceee
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1523	\| \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1524	* \| b18bc8331526
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1525	\|/
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3412 diff changeset	1526	* dd800401bd8c
3378 577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1527	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1528	\| @ 9bd10a0775e4
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1529	\|/ Obsfate: split using amend, rebase as 5:dd800401bd8c, 9:0b997eb7ceee, 10:eceed8f98ffc; split using amend, rebase as 5:dd800401bd8c, 8:b18bc8331526, 10:eceed8f98ffc
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1530	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1531	o f897c6137566
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1532	\|
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1533	o ea207398892e
577bfc34e19b test: add missing cycle test Boris Feld <boris.feld@octobus.net> parents: 3360 diff changeset	1534
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1535	Test templates with pruned commits
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1536	==================================
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1537
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1538	Test setup
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1539	----------
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1540
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1541	$ hg init $TESTTMP/templates-local-prune
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1542	$ cd $TESTTMP/templates-local-prune
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1543	$ mkcommit ROOT
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1544	$ mkcommit A0
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1545	$ hg prune .
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1546	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1547	working directory now at ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1548	1 changesets pruned
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1549
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1550	Check output
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1551	------------
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1552
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1553	$ hg up "desc(A0)" --hidden
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	1554	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3650 diff changeset	1555	updated to hidden changeset 471f378eab4c
3432 f57be161f34b test: update with new 'update' hint about obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3431 diff changeset	1556	(hidden revision '471f378eab4c' is pruned)
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1557	working directory parent is obsolete! (471f378eab4c)
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1558	(use 'hg evolve' to update to its parent successor)
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1559	$ hg tlog
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1560	@ 471f378eab4c
3566 e6bea259c227 prune: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3564 diff changeset	1561	\| Fate: pruned using prune
2591 1991935fb603 obsfate: add a new obsfate template Boris Feld <boris.feld@octobus.net> parents: 2590 diff changeset	1562	\|
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1563	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1564
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1565	$ hg fatelog -v
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1566	@ 471f378eab4c
3566 e6bea259c227 prune: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3564 diff changeset	1567	\| Obsfate: pruned using prune by test (at 1970-01-01 00:00 +0000)
2590 0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1568	\|
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1569	o ea207398892e
0d7dec71646d obsfate: prepare fatelog tests Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2589 diff changeset	1570

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Thu, 25 Oct 2018 13:24:34 +0200
branch	mercurial-4.7
changeset 4202	f555039d1a08
parent 4197	1dd5c6e6cd53
child 4204	2a7f89817540
child 4359	2cbb9914d227
permissions	-rw-r--r--