evolve: tests/test-evolve-obshistory-content-divergent.t@844b1ad5b34b (annotated)

5339 258c0a99c5b0 tests: update section headers and comments in obslog-related tests Anton Shestakov <av6@dwimlabs.net> parents: 5171 diff changeset	1	Testing obslog and other commands accessing obsolete revisions.
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	2
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	3	Global setup
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	4	============
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	5
3885 3df8b6ecce2a tests: extract obshistory setup in a separate file Boris Feld <boris.feld@octobus.net> parents: 3884 diff changeset	6	$ . $TESTDIR/testlib/obshistory_setup.sh
5079 1f92a6aa40d6 evolve: add pre-check logic for content-divergence in rewriteutil.precheck() Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4983 diff changeset	7	$ cat >> $HGRCPATH << EOF
1f92a6aa40d6 evolve: add pre-check logic for content-divergence in rewriteutil.precheck() Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4983 diff changeset	8	> [experimental]
1f92a6aa40d6 evolve: add pre-check logic for content-divergence in rewriteutil.precheck() Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4983 diff changeset	9	> evolution.allowdivergence = True
1f92a6aa40d6 evolve: add pre-check logic for content-divergence in rewriteutil.precheck() Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4983 diff changeset	10	> EOF
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	11
3891 11b775fddda8 tests: extract the content-divergence test case into a separate file Boris Feld <boris.feld@octobus.net> parents: 3890 diff changeset	12	Test output with content-divergence
11b775fddda8 tests: extract the content-divergence test case into a separate file Boris Feld <boris.feld@octobus.net> parents: 3890 diff changeset	13	===================================
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	14
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	15	Test setup
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	16	----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	17
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	18	$ hg init $TESTTMP/local-divergence
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	19	$ cd $TESTTMP/local-divergence
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	20	$ mkcommit ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	21	$ mkcommit A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	22	$ hg amend -m "A1"
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	23	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	24	@ changeset: 2:fdf9bde5129a
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	25	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	26	\| parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	27	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	28	\| date: Thu Jan 01 00:00:00 1970 +0000
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	29	\| summary: A1
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	30	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	31	\| x changeset: 1:471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	32	\|/ user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	33	\| 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	34	\| obsolete: reworded using amend as 2:fdf9bde5129a
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	35	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	36	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	37	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	38	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	39	date: Thu Jan 01 00:00:00 1970 +0000
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	40	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	41
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	42	$ hg update --hidden 'desc(A0)'
3909 f7afd3a158e3 test-compat: backout change to 1e103c7f7663 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3891 diff changeset	43	updating to a hidden changeset 471f378eab4c
f7afd3a158e3 test-compat: backout change to 1e103c7f7663 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3891 diff changeset	44	(hidden revision '471f378eab4c' was rewritten as: fdf9bde5129a)
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3730 diff changeset	45	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	46	working directory parent is obsolete! (471f378eab4c)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	47	(use 'hg evolve' to update to its successor: fdf9bde5129a)
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	48	$ hg amend -m "A2"
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	49	2 new content-divergent changesets
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	50	$ hg log --hidden -G
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	51	@ changeset: 3:65b757b745b9
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	52	\| tag: tip
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	53	\| parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	54	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	55	\| 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	56	\| instability: content-divergent
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	57	\| summary: A2
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	58	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	59	\| * changeset: 2:fdf9bde5129a
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	60	\|/ parent: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	61	\| user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	62	\| 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	63	\| instability: content-divergent
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	64	\| summary: A1
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	65	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	66	\| x changeset: 1:471f378eab4c
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	67	\|/ user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	68	\| 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	69	\| 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	70	\| obsolete: reworded using amend as 3:65b757b745b9
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	71	\| summary: A0
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	72	\|
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	73	o changeset: 0:ea207398892e
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	74	user: test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	75	date: Thu Jan 01 00:00:00 1970 +0000
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	76	summary: ROOT
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	77
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	78	Actual test
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	79	-----------
61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	80
5339 258c0a99c5b0 tests: update section headers and comments in obslog-related tests Anton Shestakov <av6@dwimlabs.net> parents: 5171 diff changeset	81	Check that obslog on the divergent revision shows both destinations
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	82	$ hg obslog --hidden 471f378eab4c --patch --no-origin
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	83	x 471f378eab4c (1) A0
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	84	reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	85	diff -r 471f378eab4c -r 65b757b745b9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	86	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	87	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	88	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	89	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	90	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	91
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	92	reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	93	diff -r 471f378eab4c -r fdf9bde5129a changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	94	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	95	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	96	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	97	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	98	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	99
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	100
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	101
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	102	Check that with all option, every changeset is shown
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	103	$ hg obslog --hidden --all 471f378eab4c --patch
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	104	@ 65b757b745b9 (3) A2
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	105	\| reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	106	\| diff -r 471f378eab4c -r 65b757b745b9 changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	107	\| --- a/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	108	\| +++ b/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	109	\| @@ -1,1 +1,1 @@
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	110	\| -A0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	111	\| +A2
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	112	\|
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	113	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	114	\| * fdf9bde5129a (2) A1
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	115	\|/ reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	116	\| diff -r 471f378eab4c -r fdf9bde5129a changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	117	\| --- a/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	118	\| +++ b/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	119	\| @@ -1,1 +1,1 @@
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	120	\| -A0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	121	\| +A1
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	122	\|
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	123	\|
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	124	x 471f378eab4c (1) A0
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	125
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	126	$ hg obslog --hidden 471f378eab4c --no-graph --no-origin -Tjson \| python -m json.tool
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	127	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	128	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	129	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	130	{
5171 7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	131	"dates": [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	132	[
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	133	*, (glob)
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	134	0
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	135	]
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	136	],
4939 7aba58dc4b73 obslog: use plural name "effects" for list of all effects Martin von Zweigbergk <martinvonz@google.com> parents: 4918 diff changeset	137	"effects": [
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	138	"description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	139	],
5169 897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	140	"operations": [
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	141	"amend"
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	142	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	143	"succnodes": [
4951 7bfd3fed5d1f obslog: make {succnodes} be full hex nodes Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	144	"65b757b745b935093c87a2bccd877521cccffcbd"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	145	],
5168 c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	146	"users": [
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	147	"test"
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	148	],
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	149	"verb": "reworded"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	150	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	151	{
5171 7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	152	"dates": [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	153	[
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	154	*, (glob)
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	155	0
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	156	]
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	157	],
4939 7aba58dc4b73 obslog: use plural name "effects" for list of all effects Martin von Zweigbergk <martinvonz@google.com> parents: 4918 diff changeset	158	"effects": [
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	159	"description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	160	],
5169 897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	161	"operations": [
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	162	"amend"
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	163	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	164	"succnodes": [
4951 7bfd3fed5d1f obslog: make {succnodes} be full hex nodes Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	165	"fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	166	],
5168 c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	167	"users": [
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	168	"test"
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	169	],
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	170	"verb": "reworded"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	171	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	172	],
4983 6d40e0166522 obslog: make {node} the full node and leave shortening to template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	173	"node": "471f378eab4c5e25f6c77f785b27c936efb22874",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	174	"shortdescription": "A0"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	175	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	176	]
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	177	$ hg obslog --hidden 471f378eab4c --no-graph -Tjson \| python -m json.tool
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	178	[
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	179	{
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	180	"markers": [],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	181	"node": "471f378eab4c5e25f6c77f785b27c936efb22874",
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	182	"shortdescription": "A0"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	183	}
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	184	]
5339 258c0a99c5b0 tests: update section headers and comments in obslog-related tests Anton Shestakov <av6@dwimlabs.net> parents: 5171 diff changeset	185	Check that obslog on the first diverged revision shows the revision and the
258c0a99c5b0 tests: update section headers and comments in obslog-related tests Anton Shestakov <av6@dwimlabs.net> parents: 5171 diff changeset	186	divergent one
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	187	$ hg obslog fdf9bde5129a --patch --no-origin
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	188	* fdf9bde5129a (2) A1
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	189	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	190	x 471f378eab4c (1) A0
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	191	reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	192	diff -r 471f378eab4c -r 65b757b745b9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	193	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	194	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	195	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	196	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	197	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	198
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	199	reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	200	diff -r 471f378eab4c -r fdf9bde5129a changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	201	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	202	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	203	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	204	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	205	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	206
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	207
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	208
5339 258c0a99c5b0 tests: update section headers and comments in obslog-related tests Anton Shestakov <av6@dwimlabs.net> parents: 5171 diff changeset	209	Check that all option shows all of them
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	210	$ hg obslog fdf9bde5129a -a --patch
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	211	@ 65b757b745b9 (3) A2
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	212	\| reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	213	\| diff -r 471f378eab4c -r 65b757b745b9 changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	214	\| --- a/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	215	\| +++ b/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	216	\| @@ -1,1 +1,1 @@
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	217	\| -A0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	218	\| +A2
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	219	\|
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	220	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	221	\| * fdf9bde5129a (2) A1
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	222	\|/ reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	223	\| diff -r 471f378eab4c -r fdf9bde5129a changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	224	\| --- a/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	225	\| +++ b/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	226	\| @@ -1,1 +1,1 @@
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	227	\| -A0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	228	\| +A1
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	229	\|
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	230	\|
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	231	x 471f378eab4c (1) A0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	232
5339 258c0a99c5b0 tests: update section headers and comments in obslog-related tests Anton Shestakov <av6@dwimlabs.net> parents: 5171 diff changeset	233	Check that obslog on the second diverged revision shows the revision and the
258c0a99c5b0 tests: update section headers and comments in obslog-related tests Anton Shestakov <av6@dwimlabs.net> parents: 5171 diff changeset	234	divergent one
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	235	$ hg obslog 65b757b745b9 --patch --no-origin
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	236	@ 65b757b745b9 (3) A2
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	237	\|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	238	x 471f378eab4c (1) A0
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	239	reworded(description) as 65b757b745b9 using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	240	diff -r 471f378eab4c -r 65b757b745b9 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	241	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	242	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	243	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	244	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	245	+A2
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	246
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	247	reworded(description) as fdf9bde5129a using amend by test (Thu Jan 01 00:00:00 1970 +0000)
3400 6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	248	diff -r 471f378eab4c -r fdf9bde5129a changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	249	--- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	250	+++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	251	@@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	252	-A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	253	+A1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	254
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	255
5339 258c0a99c5b0 tests: update section headers and comments in obslog-related tests Anton Shestakov <av6@dwimlabs.net> parents: 5171 diff changeset	256	Check that all option shows all of them
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	257	$ hg obslog 65b757b745b9 -a --patch
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	258	@ 65b757b745b9 (3) A2
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	259	\| reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	260	\| diff -r 471f378eab4c -r 65b757b745b9 changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	261	\| --- a/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	262	\| +++ b/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	263	\| @@ -1,1 +1,1 @@
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	264	\| -A0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	265	\| +A2
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	266	\|
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	267	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	268	\| * fdf9bde5129a (2) A1
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	269	\|/ reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	270	\| diff -r 471f378eab4c -r fdf9bde5129a changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	271	\| --- a/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	272	\| +++ b/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	273	\| @@ -1,1 +1,1 @@
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	274	\| -A0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	275	\| +A1
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	276	\|
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	277	\|
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	278	x 471f378eab4c (1) A0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	279
5339 258c0a99c5b0 tests: update section headers and comments in obslog-related tests Anton Shestakov <av6@dwimlabs.net> parents: 5171 diff changeset	280	Check that obslog on the both diverged revision shows a coherent graph
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	281	$ hg obslog '65b757b745b9+fdf9bde5129a' --patch
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	282	@ 65b757b745b9 (3) A2
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	283	\| reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	284	\| diff -r 471f378eab4c -r 65b757b745b9 changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	285	\| --- a/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	286	\| +++ b/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	287	\| @@ -1,1 +1,1 @@
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	288	\| -A0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	289	\| +A2
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	290	\|
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	291	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	292	\| * fdf9bde5129a (2) A1
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	293	\|/ reworded(description) from 471f378eab4c using amend by test (Thu Jan 01 00:00:00 1970 +0000)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	294	\| diff -r 471f378eab4c -r fdf9bde5129a changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	295	\| --- a/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	296	\| +++ b/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	297	\| @@ -1,1 +1,1 @@
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	298	\| -A0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	299	\| +A1
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	300	\|
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	301	\|
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	302	x 471f378eab4c (1) A0
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	303
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	304	$ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph --no-origin -Tjson \| python -m json.tool
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	305	[
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	306	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	307	"markers": [],
4983 6d40e0166522 obslog: make {node} the full node and leave shortening to template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	308	"node": "65b757b745b935093c87a2bccd877521cccffcbd",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	309	"shortdescription": "A2"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	310	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	311	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	312	"markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	313	{
5171 7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	314	"dates": [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	315	[
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	316	*, (glob)
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	317	0
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	318	]
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	319	],
4939 7aba58dc4b73 obslog: use plural name "effects" for list of all effects Martin von Zweigbergk <martinvonz@google.com> parents: 4918 diff changeset	320	"effects": [
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	321	"description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	322	],
5169 897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	323	"operations": [
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	324	"amend"
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	325	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	326	"succnodes": [
4951 7bfd3fed5d1f obslog: make {succnodes} be full hex nodes Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	327	"65b757b745b935093c87a2bccd877521cccffcbd"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	328	],
5168 c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	329	"users": [
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	330	"test"
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	331	],
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	332	"verb": "reworded"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	333	},
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	334	{
5171 7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	335	"dates": [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	336	[
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	337	*, (glob)
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	338	0
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	339	]
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	340	],
4939 7aba58dc4b73 obslog: use plural name "effects" for list of all effects Martin von Zweigbergk <martinvonz@google.com> parents: 4918 diff changeset	341	"effects": [
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	342	"description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	343	],
5169 897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	344	"operations": [
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	345	"amend"
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	346	],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	347	"succnodes": [
4951 7bfd3fed5d1f obslog: make {succnodes} be full hex nodes Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	348	"fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	349	],
5168 c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	350	"users": [
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	351	"test"
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	352	],
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5079 diff changeset	353	"verb": "reworded"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	354	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	355	],
4983 6d40e0166522 obslog: make {node} the full node and leave shortening to template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	356	"node": "471f378eab4c5e25f6c77f785b27c936efb22874",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	357	"shortdescription": "A0"
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	358	},
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	359	{
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	360	"markers": [],
4983 6d40e0166522 obslog: make {node} the full node and leave shortening to template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	361	"node": "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	362	"shortdescription": "A1"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	363	}
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	364	]
5349 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	365	$ hg obslog '65b757b745b9+fdf9bde5129a' --no-graph -Tjson \| python -m json.tool
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	366	[
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	367	{
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	368	"markers": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	369	{
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	370	"dates": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	371	[
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	372	0.0,
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	373	0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	374	]
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	375	],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	376	"effects": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	377	"description"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	378	],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	379	"operations": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	380	"amend"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	381	],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	382	"prednodes": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	383	"471f378eab4c5e25f6c77f785b27c936efb22874"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	384	],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	385	"users": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	386	"test"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	387	],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	388	"verb": "reworded"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	389	}
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	390	],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	391	"node": "65b757b745b935093c87a2bccd877521cccffcbd",
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	392	"shortdescription": "A2"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	393	},
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	394	{
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	395	"markers": [],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	396	"node": "471f378eab4c5e25f6c77f785b27c936efb22874",
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	397	"shortdescription": "A0"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	398	},
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	399	{
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	400	"markers": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	401	{
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	402	"dates": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	403	[
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	404	*, (glob)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	405	0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	406	]
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	407	],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	408	"effects": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	409	"description"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	410	],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	411	"operations": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	412	"amend"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	413	],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	414	"prednodes": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	415	"471f378eab4c5e25f6c77f785b27c936efb22874"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	416	],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	417	"users": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	418	"test"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	419	],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	420	"verb": "reworded"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	421	}
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	422	],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	423	"node": "fdf9bde5129a28d4548fadd3f62b265cdd3b7a2e",
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	424	"shortdescription": "A1"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	425	}
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5339 diff changeset	426	]
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	427	$ hg update 471f378eab4c
3663 54a469cd5b26 test: update output to match upstream Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3567 diff changeset	428	abort: hidden revision '471f378eab4c' has diverged!
54a469cd5b26 test: update output to match upstream Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3567 diff changeset	429	(use --hidden to access hidden revisions)
2290 a36a8c6a09ac ui: change the hidden revision error message Boris Feld <boris.feld@octobus.net> parents: 2289 diff changeset	430	[255]
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	431	$ hg update --hidden 'desc(A0)'
3909 f7afd3a158e3 test-compat: backout change to 1e103c7f7663 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3891 diff changeset	432	updating to a hidden changeset 471f378eab4c
f7afd3a158e3 test-compat: backout change to 1e103c7f7663 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3891 diff changeset	433	(hidden revision '471f378eab4c' has diverged)
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3730 diff changeset	434	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	435	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	436	(471f378eab4c has diverged, use 'hg evolve --list --content-divergent' to resolve the issue)

author	Anton Shestakov <av6@dwimlabs.net>
	Fri, 08 May 2020 22:50:09 +0800
branch	mercurial-4.6
changeset 5368	844b1ad5b34b
parent 5163	1752a2e7a226
parent 5349	e8660b28bfee
permissions	-rw-r--r--