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

author	Pulkit Goyal <7895pulkit@gmail.com>
	Fri, 19 Jan 2018 17:29:48 +0530
changeset 3467	41ce24cf288d
parent 3432	f57be161f34b
child 3520	1f0c88a9dd1c
permissions	-rw-r--r--