evolve: tests/test-evolve-obshistory-amend-then-fold.t annotate

annotate tests/test-evolve-obshistory-amend-then-fold.t @ 6169:897200013007 mercurial-4.7

test-compat: merge mercurial-4.8 into mercurial-4.7

author	Anton Shestakov <av6@dwimlabs.net>
date	Fri, 19 Nov 2021 10:30:06 +0300
parents	55e9987b8384 171d13d8f0ce
children

rev	line source
5291 258c0a99c5b0 tests: update section headers and comments in obslog-related tests Anton Shestakov <av6@dwimlabs.net> parents: 5217 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
2289 61d073590fb7 ui: add better messages when the working copy become obsolete. Boris Feld <boris.feld@octobus.net> parents: diff changeset	7
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	8 Test output with amended + folded commit
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	9 ========================================
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	10
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	11 Test setup
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	12 ----------
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	13
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	14 $ hg init $TESTTMP/local-amend-fold
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	15 $ cd $TESTTMP/local-amend-fold
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	16 $ mkcommit ROOT
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	17 $ mkcommit A0
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	18 $ mkcommit B0
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	19 $ hg amend -m "B1"
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	20 $ hg log --hidden -G
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	21 @ changeset: 3:b7ea6d14e664
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	22 \| tag: tip
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	23 \| parent: 1:471f378eab4c
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	24 \| user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	25 \| date: Thu Jan 01 00:00:00 1970 +0000
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	26 \| summary: B1
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	27 \|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	28 \| x changeset: 2:0dec01379d3b
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	29 \|/ user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	30 \| 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	31 \| obsolete: reworded using amend as 3:b7ea6d14e664
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	32 \| summary: B0
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	33 \|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	34 o changeset: 1:471f378eab4c
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	35 \| user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	36 \| date: Thu Jan 01 00:00:00 1970 +0000
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	37 \| summary: A0
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	38 \|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	39 o changeset: 0:ea207398892e
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	40 user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	41 date: Thu Jan 01 00:00:00 1970 +0000
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	42 summary: ROOT
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	43
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	44 $ hg fold --exact -r 'desc(A0) + desc(B1)' --date "0 0" -m "C0"
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	45 2 changesets folded
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	46 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	47 $ hg log --hidden -G
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	48 @ changeset: 4:eb5a0daa2192
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	49 \| tag: tip
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	50 \| parent: 0:ea207398892e
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	51 \| user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	52 \| date: Thu Jan 01 00:00:00 1970 +0000
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	53 \| summary: C0
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	54 \|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	55 \| x changeset: 3:b7ea6d14e664
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	56 \| \| parent: 1:471f378eab4c
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	57 \| \| user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	58 \| \| date: Thu Jan 01 00:00:00 1970 +0000
5162 a7fb433faab6 test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	59 \| \| obsolete: rewritten using fold as 4:eb5a0daa2192
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	60 \| \| summary: B1
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	61 \| \|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	62 \| \| x changeset: 2:0dec01379d3b
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	63 \| \|/ user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	64 \| \| 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	65 \| \| obsolete: reworded using amend as 3:b7ea6d14e664
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	66 \| \| summary: B0
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	67 \| \|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	68 \| x changeset: 1:471f378eab4c
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	69 \|/ user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	70 \| date: Thu Jan 01 00:00:00 1970 +0000
5162 a7fb433faab6 test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	71 \| obsolete: rewritten using fold as 4:eb5a0daa2192
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	72 \| summary: A0
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	73 \|
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	74 o changeset: 0:ea207398892e
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	75 user: test
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	76 date: Thu Jan 01 00:00:00 1970 +0000
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	77 summary: ROOT
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	78
5215 3d7cd43d591a tests: unindent lines that only have one leading space Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	79 Actual test
3d7cd43d591a tests: unindent lines that only have one leading space Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	80 -----------
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	81
5291 258c0a99c5b0 tests: update section headers and comments in obslog-related tests Anton Shestakov <av6@dwimlabs.net> parents: 5217 diff changeset	82 Check that obslog on head shows a coherent graph
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	83 $ hg obslog eb5a0daa2192 --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	84 @ eb5a0daa2192 (4) C0
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	85 \|\
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	86 x \| 471f378eab4c (1) A0
5162 a7fb433faab6 test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	87 / rewritten(description, content) as eb5a0daa2192 using fold 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	88 \| diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	89 \| --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	90 \| +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	91 \| @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	92 \| -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	93 \| +C0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	94 \|
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	95 \| diff -r 471f378eab4c -r eb5a0daa2192 B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	96 \| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	97 \| +++ b/B0 Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	98 \| @@ -0,0 +1,1 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	99 \| +B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	100 \|
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	101 \|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	102 x b7ea6d14e664 (3) B1
5162 a7fb433faab6 test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	103 \| rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	104 \| (No patch available, changesets rebased)
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	105 \|
783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	106 x 0dec01379d3b (2) B0
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5115 diff changeset	107 reworded(description) as b7ea6d14e664 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	108 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	109 --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	110 +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	111 @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	112 -B0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	113 +B1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	114
2407 783a74c60a5e obshistory: add a graph option on the debugobshistory command Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2404 diff changeset	115
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	116 $ hg obslog eb5a0daa2192 --patch
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	117 @ eb5a0daa2192 (4) C0
5317 011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	118 \|\ rewritten(description, content) from 471f378eab4c using fold by test (Thu Jan 01 00:00:00 1970 +0000)
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	119 \| \| diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	120 \| \| --- a/changeset-description
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	121 \| \| +++ b/changeset-description
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	122 \| \| @@ -1,1 +1,1 @@
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	123 \| \| -A0
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	124 \| \| +C0
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	125 \| \|
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	126 \| \| diff -r 471f378eab4c -r eb5a0daa2192 B0
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	127 \| \| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	128 \| \| +++ b/B0 Thu Jan 01 00:00:00 1970 +0000
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	129 \| \| @@ -0,0 +1,1 @@
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	130 \| \| +B0
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	131 \| \|
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	132 \| \| rewritten(description, parent, content) from b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	133 \| \| (No patch available, changesets rebased)
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	134 \| \|
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	135 x \| 471f378eab4c (1) A0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	136 /
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	137 x b7ea6d14e664 (3) B1
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	138 \| reworded(description) from 0dec01379d3b 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: 5291 diff changeset	139 \| diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	140 \| --- a/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	141 \| +++ b/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	142 \| @@ -1,1 +1,1 @@
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	143 \| -B0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	144 \| +B1
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	145 \|
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	146 \|
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	147 x 0dec01379d3b (2) B0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	148
5291 258c0a99c5b0 tests: update section headers and comments in obslog-related tests Anton Shestakov <av6@dwimlabs.net> parents: 5217 diff changeset	149 Check that obslog on A0 with all option shows everything
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	150 $ hg obslog 1 --hidden --all --patch --no-origin
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	151 @ eb5a0daa2192 (4) C0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	152 \|\
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	153 x \| 471f378eab4c (1) A0
5162 a7fb433faab6 test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	154 / rewritten(description, content) as eb5a0daa2192 using fold 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	155 \| diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	156 \| --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	157 \| +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	158 \| @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	159 \| -A0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	160 \| +C0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	161 \|
2637 49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	162 \| diff -r 471f378eab4c -r eb5a0daa2192 B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	163 \| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	164 \| +++ b/B0 Thu Jan 01 00:00:00 1970 +0000
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	165 \| @@ -0,0 +1,1 @@
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	166 \| +B0
49f2741c4dd7 obslog: add a patch option Boris Feld <boris.feld@octobus.net> parents: 2585 diff changeset	167 \|
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	168 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	169 x b7ea6d14e664 (3) B1
5162 a7fb433faab6 test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	170 \| rewritten(description, parent, content) as eb5a0daa2192 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
3055 774b4ea6ca58 obslog: remove the word "yet" from "No patch available yet" Pulkit Goyal <7895pulkit@gmail.com> parents: 3054 diff changeset	171 \| (No patch available, changesets rebased)
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	172 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: 2483 diff changeset	173 x 0dec01379d3b (2) B0
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5115 diff changeset	174 reworded(description) as b7ea6d14e664 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	175 diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	176 --- a/changeset-description
6d345d7ca682 obslog: add header to the changeset description diff Pulkit Goyal <7895pulkit@gmail.com> parents: 3399 diff changeset	177 +++ b/changeset-description
2639 a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	178 @@ -1,1 +1,1 @@
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	179 -B0
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	180 +B1
a5d8062f55ba obslog: also display description patch with --patch Boris Feld <boris.feld@octobus.net> parents: 2637 diff changeset	181
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	182
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	183 $ hg obslog 1 --hidden --all --patch
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	184 @ eb5a0daa2192 (4) C0
5317 011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	185 \|\ rewritten(description, content) from 471f378eab4c using fold by test (Thu Jan 01 00:00:00 1970 +0000)
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	186 \| \| diff -r 471f378eab4c -r eb5a0daa2192 changeset-description
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	187 \| \| --- a/changeset-description
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	188 \| \| +++ b/changeset-description
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	189 \| \| @@ -1,1 +1,1 @@
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	190 \| \| -A0
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	191 \| \| +C0
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	192 \| \|
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	193 \| \| diff -r 471f378eab4c -r eb5a0daa2192 B0
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	194 \| \| --- /dev/null Thu Jan 01 00:00:00 1970 +0000
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	195 \| \| +++ b/B0 Thu Jan 01 00:00:00 1970 +0000
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	196 \| \| @@ -0,0 +1,1 @@
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	197 \| \| +B0
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	198 \| \|
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	199 \| \| rewritten(description, parent, content) from b7ea6d14e664 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	200 \| \| (No patch available, changesets rebased)
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	201 \| \|
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	202 x \| 471f378eab4c (1) A0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	203 /
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	204 x b7ea6d14e664 (3) B1
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	205 \| reworded(description) from 0dec01379d3b 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: 5291 diff changeset	206 \| diff -r 0dec01379d3b -r b7ea6d14e664 changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	207 \| --- a/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	208 \| +++ b/changeset-description
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	209 \| @@ -1,1 +1,1 @@
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	210 \| -B0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	211 \| +B1
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	212 \|
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	213 \|
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	214 x 0dec01379d3b (2) B0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	215
5613 87966baf6ea9 tests: use appropriate Python (2 or 3) for json.tool Anton Shestakov <av6@dwimlabs.net> parents: 5301 diff changeset	216 $ hg obslog eb5a0daa2192 --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	217 [
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	218 {
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	219 "markers": [],
4983 6d40e0166522 obslog: make {node} the full node and leave shortening to template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	220 "node": "eb5a0daa21923bbf8caeb2c42085b9e463861fd0",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	221 "shortdescription": "C0"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	222 },
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	223 {
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	224 "markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	225 {
5171 7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	226 "dates": [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	227 [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	228 *, (glob)
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	229 0
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	230 ]
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	231 ],
4939 7aba58dc4b73 obslog: use plural name "effects" for list of all effects Martin von Zweigbergk <martinvonz@google.com> parents: 4918 diff changeset	232 "effects": [
2585 b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	233 *, (glob)
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	234 *, (glob)
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	235 "content"
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	236 ],
5169 897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	237 "operations": [
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	238 "fold"
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	239 ],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	240 "succnodes": [
4951 7bfd3fed5d1f obslog: make {succnodes} be full hex nodes Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	241 "eb5a0daa21923bbf8caeb2c42085b9e463861fd0"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	242 ],
5168 c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	243 "users": [
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	244 "test"
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	245 ],
5162 a7fb433faab6 test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	246 "verb": "rewritten"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	247 }
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	248 ],
4983 6d40e0166522 obslog: make {node} the full node and leave shortening to template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	249 "node": "b7ea6d14e664bdc8922221f7992631b50da3fb07",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	250 "shortdescription": "B1"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	251 },
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	252 {
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	253 "markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	254 {
5171 7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	255 "dates": [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	256 [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	257 *, (glob)
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	258 0
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	259 ]
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	260 ],
4939 7aba58dc4b73 obslog: use plural name "effects" for list of all effects Martin von Zweigbergk <martinvonz@google.com> parents: 4918 diff changeset	261 "effects": [
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	262 "description"
586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	263 ],
5169 897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	264 "operations": [
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	265 "amend"
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	266 ],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	267 "succnodes": [
4951 7bfd3fed5d1f obslog: make {succnodes} be full hex nodes Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	268 "b7ea6d14e664bdc8922221f7992631b50da3fb07"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	269 ],
5168 c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	270 "users": [
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	271 "test"
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	272 ],
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5115 diff changeset	273 "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	274 }
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	275 ],
4983 6d40e0166522 obslog: make {node} the full node and leave shortening to template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	276 "node": "0dec01379d3be6318c470ead31b1fe7ae7cb53d5",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	277 "shortdescription": "B0"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	278 },
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	279 {
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	280 "markers": [
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	281 {
5171 7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	282 "dates": [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	283 [
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	284 *, (glob)
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	285 0
7f7f40cc6c9b obslog: make date template property into dates Anton Shestakov <av6@dwimlabs.net> parents: 5169 diff changeset	286 ]
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	287 ],
4939 7aba58dc4b73 obslog: use plural name "effects" for list of all effects Martin von Zweigbergk <martinvonz@google.com> parents: 4918 diff changeset	288 "effects": [
2585 b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	289 "description",
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	290 "content"
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	291 ],
5169 897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	292 "operations": [
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	293 "fold"
897b371cd0c5 obslog: make operation template property into operations Anton Shestakov <av6@dwimlabs.net> parents: 5168 diff changeset	294 ],
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	295 "succnodes": [
4951 7bfd3fed5d1f obslog: make {succnodes} be full hex nodes Martin von Zweigbergk <martinvonz@google.com> parents: 4939 diff changeset	296 "eb5a0daa21923bbf8caeb2c42085b9e463861fd0"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	297 ],
5168 c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	298 "users": [
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	299 "test"
c7ca43bba6c5 obslog: make user template property into users Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	300 ],
5317 011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	301 "verb": "rewritten"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	302 }
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	303 ],
4983 6d40e0166522 obslog: make {node} the full node and leave shortening to template Martin von Zweigbergk <martinvonz@google.com> parents: 4951 diff changeset	304 "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	305 "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	306 }
e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	307 ]
5613 87966baf6ea9 tests: use appropriate Python (2 or 3) for json.tool Anton Shestakov <av6@dwimlabs.net> parents: 5301 diff changeset	308 $ hg obslog eb5a0daa2192 --no-graph -Tjson \| "$PYTHON" -m json.tool
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	309 [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	310 {
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	311 "markers": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	312 {
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	313 "dates": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	314 [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	315 *, (glob)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	316 0
5317 011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	317 ]
2957 586c9ace20b3 obslog: simplify formatter keys Alain Leufroy parents: 2956 diff changeset	318 ],
4939 7aba58dc4b73 obslog: use plural name "effects" for list of all effects Martin von Zweigbergk <martinvonz@google.com> parents: 4918 diff changeset	319 "effects": [
2585 b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	320 "description",
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	321 "content"
b5e3fe610beb effectflag: activate effect flag on test-evolve-obshistory test file Boris Feld <boris.feld@octobus.net> parents: 2546 diff changeset	322 ],
5317 011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	323 "operations": [
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	324 "fold"
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	325 ],
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	326 "prednodes": [
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	327 "471f378eab4c5e25f6c77f785b27c936efb22874"
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	328 ],
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	329 "users": [
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	330 "test"
2342 e28026b4d3c1 obshistory: use formatter instead of ui.write in the debugobshistory command Boris Feld <boris.feld@octobus.net> parents: 2336 diff changeset	331 ],
5317 011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	332 "verb": "rewritten"
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	333 },
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	334 {
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5238 5301 diff changeset	335 "dates": [
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	336 [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	337 *, (glob)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	338 0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	339 ]
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	340 ],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	341 "effects": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	342 *, (glob)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	343 *, (glob)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	344 "content"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	345 ],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	346 "operations": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	347 "fold"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	348 ],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	349 "prednodes": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	350 "b7ea6d14e664bdc8922221f7992631b50da3fb07"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	351 ],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	352 "users": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	353 "test"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	354 ],
5162 a7fb433faab6 test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5125 diff changeset	355 "verb": "rewritten"
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	356 }
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	357 ],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	358 "node": "eb5a0daa21923bbf8caeb2c42085b9e463861fd0",
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	359 "shortdescription": "C0"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	360 },
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	361 {
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	362 "markers": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	363 {
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	364 "dates": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	365 [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	366 *, (glob)
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	367 0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	368 ]
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	369 ],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	370 "effects": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	371 "description"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	372 ],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	373 "operations": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	374 "amend"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	375 ],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	376 "prednodes": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	377 "0dec01379d3be6318c470ead31b1fe7ae7cb53d5"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	378 ],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	379 "users": [
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	380 "test"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	381 ],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	382 "verb": "reworded"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	383 }
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	384 ],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	385 "node": "b7ea6d14e664bdc8922221f7992631b50da3fb07",
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	386 "shortdescription": "B1"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	387 },
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	388 {
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	389 "markers": [],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	390 "node": "0dec01379d3be6318c470ead31b1fe7ae7cb53d5",
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	391 "shortdescription": "B0"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	392 },
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	393 {
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	394 "markers": [],
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	395 "node": "471f378eab4c5e25f6c77f785b27c936efb22874",
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	396 "shortdescription": "A0"
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	397 }
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	398 ]
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	399 $ hg update 471f378eab4c
5755 08c30eef85d3 tests: back out changeset d0f73113fcc0 Anton Shestakov <av6@dwimlabs.net> parents: 5672 diff changeset	400 abort: hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192!
3663 54a469cd5b26 test: update output to match upstream Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3567 diff changeset	401 (use --hidden to access hidden revisions)
6157 36a746dda93a test-compat: back out changeset 98864c7f9619 Anton Shestakov <av6@dwimlabs.net> parents: 6081 diff changeset	402 [255]
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	403 $ hg update --hidden 'desc(A0)'
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3730 diff changeset	404 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: 3730 diff changeset	405 updated to hidden changeset 471f378eab4c
3432 f57be161f34b test: update with new 'update' hint about obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3417 diff changeset	406 (hidden revision '471f378eab4c' was rewritten as: eb5a0daa2192)
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	407 working directory parent is obsolete! (471f378eab4c)
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	408 (use 'hg evolve' to update to its successor: eb5a0daa2192)
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	409 $ hg update --hidden 0dec01379d3b
3747 1e103c7f7663 test: update to new outputs Boris Feld <boris.feld@octobus.net> parents: 3730 diff changeset	410 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: 3730 diff changeset	411 updated to hidden changeset 0dec01379d3b
3432 f57be161f34b test: update with new 'update' hint about obsfate Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3417 diff changeset	412 (hidden revision '0dec01379d3b' was rewritten as: eb5a0daa2192)
2336 93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	413 working directory parent is obsolete! (0dec01379d3b)
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	414 (use 'hg evolve' to update to its successor: eb5a0daa2192)
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	415 $ hg update 0dec01379d3b
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	416 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	417 $ hg update --hidden 'desc(B0)'
93a37e13424f obshistory: add a debugobshistory command to show obs history of a revs Boris Feld <boris.feld@octobus.net> parents: 2290 diff changeset	418 0 files updated, 0 files merged, 0 files removed, 0 files unresolved

Mercurial > evolve

annotate tests/test-evolve-obshistory-amend-then-fold.t @ 6169:897200013007 mercurial-4.7