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

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

author	Anton Shestakov <av6@dwimlabs.net>
	Sat, 29 Feb 2020 14:55:37 +0700
branch	stable
changeset 5153	1797ef00d15f
parent 5123	900668a93629
child 5158	8d20c0af010a
child 5255	939ff6ea1e7d
child 5330	0bc31f853862
permissions	-rw-r--r--