evolve: tests/test-evolve-obshistory-complex.t annotate

annotate tests/test-evolve-obshistory-complex.t @ 5539:452651e69848 stable

evolvecmd: don't set `branchmerge=True` while resolving phase divergence We are not going to create a merge commit, neither we are using two parents in any way. I am unable to see any reason why `branchmerge` should be passed as `True` here. Passing branchmerge as True leads to side effect of having merge related commit information stored in mergestate which leads us to having an active mergestate.

author	Pulkit Goyal <7895pulkit@gmail.com>
date	Thu, 17 Sep 2020 14:51:45 +0530
parents	e8660b28bfee
children	e6e92835d42d e5250f24eed7

rev	line source
5291 258c0a99c5b0 tests: update section headers and comments in obslog-related tests Anton Shestakov <av6@dwimlabs.net> parents: 5290 diff changeset	1 Testing obslog and other commands accessing obsolete revisions.
258c0a99c5b0 tests: update section headers and comments in obslog-related tests Anton Shestakov <av6@dwimlabs.net> parents: 5290 diff changeset	2
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	3 Global setup
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	4 ============
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	5
5290 7e93d9db1d1a tests: use common obshistory_setup.sh script instead of manual setup Anton Shestakov <av6@dwimlabs.net> parents: 5123 diff changeset	6 $ . $TESTDIR/testlib/obshistory_setup.sh
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	7
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	8 Test obslog with split + fold + split
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	9 =====================================
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	10
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	11 Test setup
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	12 ----------
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	13
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	14 $ hg init $TESTTMP/splitfoldsplit
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	15 $ cd $TESTTMP/splitfoldsplit
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	16 $ mkcommit ROOT
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	17 $ mkcommit A
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	18 $ mkcommit B
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	19 $ mkcommit C
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	20 $ mkcommit D
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	21 $ mkcommit E
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	22 $ mkcommit F
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	23 $ hg log -G
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	24 @ changeset: 6:d9f908fde1a1
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	25 \| tag: tip
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	26 \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	27 \| date: Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	28 \| summary: F
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	29 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	30 o changeset: 5:0da815c333f6
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	31 \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	32 \| date: Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	33 \| summary: E
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	34 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	35 o changeset: 4:868d2e0eb19c
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	36 \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	37 \| date: Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	38 \| summary: D
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	39 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	40 o changeset: 3:a8df460dbbfe
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	41 \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	42 \| date: Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	43 \| summary: C
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	44 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	45 o changeset: 2:c473644ee0e9
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	46 \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	47 \| date: Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	48 \| summary: B
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	49 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	50 o changeset: 1:2a34000d3544
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	51 \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	52 \| date: Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	53 \| summary: A
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	54 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	55 o changeset: 0:ea207398892e
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	56 user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	57 date: Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	58 summary: ROOT
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	59
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	60 Split commits two by two
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	61 ------------------------
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	62
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	63 $ hg fold --exact -r 1 -r 2 --date "0 0" -m "fold0"
3431 2e703ed1c713 evolve: update output for wider reporting of troubled changesets Martin von Zweigbergk <martinvonz@google.com> parents: 3417 diff changeset	64 4 new orphan changesets
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	65 2 changesets folded
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	66 $ hg fold --exact -r 3 -r 4 --date "0 0" -m "fold1"
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	67 2 changesets folded
3219 b73bd280b21c fold: add support for storing a note in obsmarker Pulkit Goyal <7895pulkit@gmail.com> parents: 3217 diff changeset	68 $ hg fold --exact -r 5 -r 6 --date "0 0" -m "fold2" -n "folding changesets to test"
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	69 2 changesets folded
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	70 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
3219 b73bd280b21c fold: add support for storing a note in obsmarker Pulkit Goyal <7895pulkit@gmail.com> parents: 3217 diff changeset	71 $ hg obslog -r .
b73bd280b21c fold: add support for storing a note in obsmarker Pulkit Goyal <7895pulkit@gmail.com> parents: 3217 diff changeset	72 @ 100cc25b765f (9) fold2
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	73 \|\ folded(description, parent, content) from 0da815c333f6, d9f908fde1a1 using fold 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	74 \| \| note: folding changesets to test
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	75 \| \|
3219 b73bd280b21c fold: add support for storing a note in obsmarker Pulkit Goyal <7895pulkit@gmail.com> parents: 3217 diff changeset	76 x \| 0da815c333f6 (5) E
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	77 /
3219 b73bd280b21c fold: add support for storing a note in obsmarker Pulkit Goyal <7895pulkit@gmail.com> parents: 3217 diff changeset	78 x d9f908fde1a1 (6) F
b73bd280b21c fold: add support for storing a note in obsmarker Pulkit Goyal <7895pulkit@gmail.com> parents: 3217 diff changeset	79
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	80 $ hg log -G
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	81 @ changeset: 9:100cc25b765f
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	82 \| tag: tip
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	83 \| parent: 4:868d2e0eb19c
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	84 \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	85 \| 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	86 \| instability: orphan
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	87 \| summary: fold2
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	88 \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	89 \| * changeset: 8:d15d0ffc75f6
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	90 \| \| parent: 2:c473644ee0e9
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	91 \| \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	92 \| \| 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	93 \| \| instability: orphan
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	94 \| \| summary: fold1
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	95 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	96 \| \| o changeset: 7:b868bc49b0a4
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	97 \| \| \| parent: 0:ea207398892e
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	98 \| \| \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	99 \| \| \| date: Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	100 \| \| \| summary: fold0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	101 \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	102 x \| \| changeset: 4:868d2e0eb19c
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	103 \| \| \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	104 \| \| \| date: Thu Jan 01 00:00:00 1970 +0000
5115 f44cc9abf21c obshistory: add 'folded' to the list of precise verbs Anton Shestakov <av6@dwimlabs.net> parents: 4712 diff changeset	105 \| \| \| obsolete: folded using fold as 8:d15d0ffc75f6
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	106 \| \| \| summary: D
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	107 \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	108 x \| \| changeset: 3:a8df460dbbfe
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	109 \|/ / user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	110 \| \| date: Thu Jan 01 00:00:00 1970 +0000
5115 f44cc9abf21c obshistory: add 'folded' to the list of precise verbs Anton Shestakov <av6@dwimlabs.net> parents: 4712 diff changeset	111 \| \| obsolete: folded using fold as 8:d15d0ffc75f6
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	112 \| \| summary: C
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	113 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	114 x \| changeset: 2:c473644ee0e9
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	115 \| \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	116 \| \| date: Thu Jan 01 00:00:00 1970 +0000
5115 f44cc9abf21c obshistory: add 'folded' to the list of precise verbs Anton Shestakov <av6@dwimlabs.net> parents: 4712 diff changeset	117 \| \| obsolete: folded using fold as 7:b868bc49b0a4
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	118 \| \| summary: B
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	119 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	120 x \| changeset: 1:2a34000d3544
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	121 \|/ user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	122 \| date: Thu Jan 01 00:00:00 1970 +0000
5115 f44cc9abf21c obshistory: add 'folded' to the list of precise verbs Anton Shestakov <av6@dwimlabs.net> parents: 4712 diff changeset	123 \| obsolete: folded using fold as 7:b868bc49b0a4
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	124 \| summary: A
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	125 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	126 o changeset: 0:ea207398892e
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	127 user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	128 date: Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	129 summary: ROOT
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	130
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	131
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	132 Then split
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	133 ----------
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	134
4298 a98fa6c0d4f3 split: only accept explicit revision through the `-r` option Boris Feld <boris.feld@octobus.net> parents: 4294 diff changeset	135 $ hg split --rev "desc(fold0)" -d "0 0" << EOF
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	136 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	137 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	138 > N
4294 8974a05a49fa split: rework the prompt to be more standard Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4293 diff changeset	139 > Y
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	140 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	141 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	142 > EOF
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	143 0 files updated, 0 files merged, 6 files removed, 0 files unresolved
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	144 adding A
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	145 adding B
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	146 diff --git a/A b/A
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	147 new file mode 100644
4712 e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	148 examine changes to 'A'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	149 (enter ? for help) [Ynesfdaq?] Y
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	150
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	151 @@ -0,0 +1,1 @@
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	152 +A
4712 e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	153 record change 1/2 to 'A'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	154 (enter ? for help) [Ynesfdaq?] Y
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	155
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	156 diff --git a/B b/B
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	157 new file mode 100644
4712 e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	158 examine changes to 'B'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	159 (enter ? for help) [Ynesfdaq?] N
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	160
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	161 created new head
4294 8974a05a49fa split: rework the prompt to be more standard Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4293 diff changeset	162 continue splitting? [Ycdq?] Y
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	163 diff --git a/B b/B
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	164 new file mode 100644
4712 e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	165 examine changes to 'B'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	166 (enter ? for help) [Ynesfdaq?] Y
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	167
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	168 @@ -0,0 +1,1 @@
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	169 +B
4712 e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	170 record this change to 'B'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	171 (enter ? for help) [Ynesfdaq?] Y
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	172
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	173 no more change to split
4298 a98fa6c0d4f3 split: only accept explicit revision through the `-r` option Boris Feld <boris.feld@octobus.net> parents: 4294 diff changeset	174 $ hg split --rev "desc(fold1)" -d "0 0" << EOF
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	175 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	176 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	177 > N
4294 8974a05a49fa split: rework the prompt to be more standard Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4293 diff changeset	178 > Y
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	179 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	180 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	181 > EOF
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	182 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	183 adding C
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	184 adding D
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	185 diff --git a/C b/C
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	186 new file mode 100644
4712 e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	187 examine changes to 'C'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	188 (enter ? for help) [Ynesfdaq?] Y
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	189
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	190 @@ -0,0 +1,1 @@
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	191 +C
4712 e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	192 record change 1/2 to 'C'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	193 (enter ? for help) [Ynesfdaq?] Y
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	194
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	195 diff --git a/D b/D
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	196 new file mode 100644
4712 e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	197 examine changes to 'D'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	198 (enter ? for help) [Ynesfdaq?] N
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	199
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	200 created new head
4294 8974a05a49fa split: rework the prompt to be more standard Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4293 diff changeset	201 continue splitting? [Ycdq?] Y
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	202 diff --git a/D b/D
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	203 new file mode 100644
4712 e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	204 examine changes to 'D'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	205 (enter ? for help) [Ynesfdaq?] Y
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	206
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	207 @@ -0,0 +1,1 @@
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	208 +D
4712 e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	209 record this change to 'D'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	210 (enter ? for help) [Ynesfdaq?] Y
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	211
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	212 no more change to split
3431 2e703ed1c713 evolve: update output for wider reporting of troubled changesets Martin von Zweigbergk <martinvonz@google.com> parents: 3417 diff changeset	213 1 new orphan changesets
4298 a98fa6c0d4f3 split: only accept explicit revision through the `-r` option Boris Feld <boris.feld@octobus.net> parents: 4294 diff changeset	214 $ hg split --rev "desc(fold2)" -d "0 0" << EOF
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	215 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	216 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	217 > N
4294 8974a05a49fa split: rework the prompt to be more standard Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4293 diff changeset	218 > Y
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	219 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	220 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	221 > EOF
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	222 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	223 adding E
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	224 adding F
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	225 diff --git a/E b/E
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	226 new file mode 100644
4712 e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	227 examine changes to 'E'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	228 (enter ? for help) [Ynesfdaq?] Y
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	229
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	230 @@ -0,0 +1,1 @@
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	231 +E
4712 e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	232 record change 1/2 to 'E'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	233 (enter ? for help) [Ynesfdaq?] Y
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	234
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	235 diff --git a/F b/F
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	236 new file mode 100644
4712 e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	237 examine changes to 'F'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	238 (enter ? for help) [Ynesfdaq?] N
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	239
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	240 created new head
4294 8974a05a49fa split: rework the prompt to be more standard Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4293 diff changeset	241 continue splitting? [Ycdq?] Y
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	242 diff --git a/F b/F
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	243 new file mode 100644
4712 e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	244 examine changes to 'F'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	245 (enter ? for help) [Ynesfdaq?] Y
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	246
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	247 @@ -0,0 +1,1 @@
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	248 +F
4712 e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	249 record this change to 'F'?
e2c548cc83b5 tests: update output for shorted prompts from Mercurial Martin von Zweigbergk <martinvonz@google.com> parents: 4298 diff changeset	250 (enter ? for help) [Ynesfdaq?] Y
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	251
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	252 no more change to split
3431 2e703ed1c713 evolve: update output for wider reporting of troubled changesets Martin von Zweigbergk <martinvonz@google.com> parents: 3417 diff changeset	253 1 new orphan changesets
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	254 $ hg log -G
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	255 @ changeset: 15:d4a000f63ee9
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	256 \| tag: tip
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	257 \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	258 \| 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	259 \| instability: orphan
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	260 \| summary: fold2
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	261 \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	262 * changeset: 14:ec31316faa9d
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	263 \| parent: 4:868d2e0eb19c
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	264 \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	265 \| 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	266 \| instability: orphan
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	267 \| summary: fold2
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	268 \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	269 \| * changeset: 13:d0f33db50670
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	270 \| \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	271 \| \| 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	272 \| \| instability: orphan
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	273 \| \| summary: fold1
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	274 \| \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	275 \| * changeset: 12:7b3290f6e0a0
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	276 \| \| parent: 2:c473644ee0e9
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	277 \| \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	278 \| \| 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	279 \| \| instability: orphan
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	280 \| \| summary: fold1
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	281 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	282 \| \| o changeset: 11:e036916b63ea
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	283 \| \| \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	284 \| \| \| date: Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	285 \| \| \| summary: fold0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	286 \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	287 \| \| o changeset: 10:19e14c8397fc
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	288 \| \| \| parent: 0:ea207398892e
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	289 \| \| \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	290 \| \| \| date: Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	291 \| \| \| summary: fold0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	292 \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	293 x \| \| changeset: 4:868d2e0eb19c
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	294 \| \| \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	295 \| \| \| date: Thu Jan 01 00:00:00 1970 +0000
3567 5ddea3b8d2a4 split: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3566 diff changeset	296 \| \| \| obsolete: split using fold, split as 12:7b3290f6e0a0, 13:d0f33db50670
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	297 \| \| \| summary: D
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	298 \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	299 x \| \| changeset: 3:a8df460dbbfe
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	300 \|/ / user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	301 \| \| date: Thu Jan 01 00:00:00 1970 +0000
3567 5ddea3b8d2a4 split: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3566 diff changeset	302 \| \| obsolete: split using fold, split as 12:7b3290f6e0a0, 13:d0f33db50670
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	303 \| \| summary: C
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	304 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	305 x \| changeset: 2:c473644ee0e9
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	306 \| \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	307 \| \| date: Thu Jan 01 00:00:00 1970 +0000
3567 5ddea3b8d2a4 split: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3566 diff changeset	308 \| \| obsolete: split using fold, split as 10:19e14c8397fc, 11:e036916b63ea
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	309 \| \| summary: B
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	310 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	311 x \| changeset: 1:2a34000d3544
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	312 \|/ user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	313 \| date: Thu Jan 01 00:00:00 1970 +0000
3567 5ddea3b8d2a4 split: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3566 diff changeset	314 \| obsolete: split using fold, split as 10:19e14c8397fc, 11:e036916b63ea
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	315 \| summary: A
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	316 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	317 o changeset: 0:ea207398892e
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	318 user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	319 date: Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	320 summary: ROOT
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	321
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	322
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	323 Connect them all
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	324 ----------------
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	325
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	326 $ hg prune -s 12 -r 11
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	327 1 changesets pruned
3217 b6ba296532cb prune: add support for storing a note in obsmarker Pulkit Goyal <7895pulkit@gmail.com> parents: 3083 diff changeset	328 $ hg prune -s 14 -r 13 -n "this is a note stored in obsmarker in prune"
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	329 1 changesets pruned
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	330 $ hg log -G
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	331 @ changeset: 15:d4a000f63ee9
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	332 \| tag: tip
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	333 \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	334 \| 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	335 \| instability: orphan
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	336 \| summary: fold2
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	337 \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	338 * changeset: 14:ec31316faa9d
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	339 \| parent: 4:868d2e0eb19c
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	340 \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	341 \| 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	342 \| instability: orphan
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	343 \| summary: fold2
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	344 \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	345 \| * changeset: 12:7b3290f6e0a0
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	346 \| \| parent: 2:c473644ee0e9
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	347 \| \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	348 \| \| 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	349 \| \| instability: orphan
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	350 \| \| summary: fold1
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	351 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	352 \| \| o changeset: 10:19e14c8397fc
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	353 \| \| \| parent: 0:ea207398892e
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	354 \| \| \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	355 \| \| \| date: Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	356 \| \| \| summary: fold0
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	357 \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	358 x \| \| changeset: 4:868d2e0eb19c
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	359 \| \| \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	360 \| \| \| date: Thu Jan 01 00:00:00 1970 +0000
3567 5ddea3b8d2a4 split: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3566 diff changeset	361 \| \| \| obsolete: split using fold, prune, split as 12:7b3290f6e0a0, 14:ec31316faa9d
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	362 \| \| \| summary: D
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	363 \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	364 x \| \| changeset: 3:a8df460dbbfe
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	365 \|/ / user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	366 \| \| date: Thu Jan 01 00:00:00 1970 +0000
3567 5ddea3b8d2a4 split: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3566 diff changeset	367 \| \| obsolete: split using fold, prune, split as 12:7b3290f6e0a0, 14:ec31316faa9d
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	368 \| \| summary: C
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	369 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	370 x \| changeset: 2:c473644ee0e9
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	371 \| \| user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	372 \| \| date: Thu Jan 01 00:00:00 1970 +0000
3567 5ddea3b8d2a4 split: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3566 diff changeset	373 \| \| obsolete: split using fold, prune, split as 10:19e14c8397fc, 12:7b3290f6e0a0
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	374 \| \| summary: B
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	375 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	376 x \| changeset: 1:2a34000d3544
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	377 \|/ user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	378 \| date: Thu Jan 01 00:00:00 1970 +0000
3567 5ddea3b8d2a4 split: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3566 diff changeset	379 \| obsolete: split using fold, prune, split as 10:19e14c8397fc, 12:7b3290f6e0a0
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	380 \| summary: A
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	381 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	382 o changeset: 0:ea207398892e
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	383 user: test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	384 date: Thu Jan 01 00:00:00 1970 +0000
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	385 summary: ROOT
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	386
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	387 Actual Test
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	388 ===========
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	389
5291 258c0a99c5b0 tests: update section headers and comments in obslog-related tests Anton Shestakov <av6@dwimlabs.net> parents: 5290 diff changeset	390 Obslog should show a subset of the obs history, this test checks that the
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	391 walking algorithm works no matter the level of successors + precursors
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	392
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	393 $ hg obslog 12
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	394 * 7b3290f6e0a0 (12) fold1
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	395 \|\ split(parent, content) from d15d0ffc75f6 using split 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	396 \| \| rewritten(description, parent, content) from e036916b63ea using prune 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	397 \| \|
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	398 x \| d15d0ffc75f6 (8) fold1
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	399 \|\ \ folded(description, parent, content) from 868d2e0eb19c, a8df460dbbfe using fold 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	400 \| \| \|
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	401 \| \| x e036916b63ea (11) fold0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	402 \| \| \| split(parent, content) from b868bc49b0a4 using split 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	403 \| \| \|
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	404 x \| \| 868d2e0eb19c (4) D
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	405 / /
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	406 x / a8df460dbbfe (3) C
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	407 /
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	408 x b868bc49b0a4 (7) fold0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	409 \|\ folded(description, parent, content) from 2a34000d3544, c473644ee0e9 using fold 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	410 \| \|
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	411 x \| 2a34000d3544 (1) A
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	412 /
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	413 x c473644ee0e9 (2) B
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	414
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	415
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	416 $ hg obslog 12 --no-origin
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	417 * 7b3290f6e0a0 (12) fold1
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	418 \|\
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	419 x \| d15d0ffc75f6 (8) fold1
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5115 diff changeset	420 \|\ \ split(parent, content) as 7b3290f6e0a0, d0f33db50670 using split by test (Thu Jan 01 00:00:00 1970 +0000)
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	421 \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	422 \| \| x e036916b63ea (11) fold0
3566 e6bea259c227 prune: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3564 diff changeset	423 \| \| \| rewritten(description, parent, content) as 7b3290f6e0a0 using prune by test (Thu Jan 01 00:00:00 1970 +0000)
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	424 \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	425 x \| \| 868d2e0eb19c (4) D
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5115 diff changeset	426 / / folded(description, parent, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	427 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	428 x \| a8df460dbbfe (3) C
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5115 diff changeset	429 / folded(description, content) as d15d0ffc75f6 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	430 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	431 x b868bc49b0a4 (7) fold0
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5115 diff changeset	432 \|\ split(parent, content) as 19e14c8397fc, e036916b63ea using split by test (Thu Jan 01 00:00:00 1970 +0000)
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	433 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	434 x \| 2a34000d3544 (1) A
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5115 diff changeset	435 / folded(description, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	436 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	437 x c473644ee0e9 (2) B
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5115 diff changeset	438 folded(description, parent, content) as b868bc49b0a4 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	439
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	440 While with all option, we should see 15 changesets
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	441
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	442 $ hg obslog --all 15
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	443 o 19e14c8397fc (10) fold0
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	444 \| split(parent, content) from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000)
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	445 \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	446 \| * 7b3290f6e0a0 (12) fold1
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	447 \| \|\ split(parent, content) from d15d0ffc75f6 using split 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	448 \| \| \| rewritten(description, parent, content) from e036916b63ea using prune 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	449 \| \| \|
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	450 \| \| \| @ d4a000f63ee9 (15) fold2
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	451 \| \| \| \| split(parent, content) from 100cc25b765f using split by test (Thu Jan 01 00:00:00 1970 +0000)
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	452 \| \| \| \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	453 \| \| \| \| * ec31316faa9d (14) fold2
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	454 \| \| \| \|/\| split(parent, content) from 100cc25b765f using split 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	455 \| \| \| \| \| rewritten(description, parent, content) from d0f33db50670 using prune 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	456 \| \| \| \| \| note: this is a note stored in obsmarker in prune
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	457 \| \| \| \| \|
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	458 \| \| \| x \| 100cc25b765f (9) fold2
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	459 \| \| \| \|\ \ folded(description, parent, content) from 0da815c333f6, d9f908fde1a1 using fold 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	460 \| \| \| \| \| \| note: folding changesets to test
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	461 \| \| \| \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	462 \| +-------x d0f33db50670 (13) fold1
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	463 \| \| \| \| \| split(parent, content) from d15d0ffc75f6 using split by test (Thu Jan 01 00:00:00 1970 +0000)
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	464 \| \| \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	465 +---x \| \| e036916b63ea (11) fold0
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	466 \| \| / / split(parent, content) from b868bc49b0a4 using split by test (Thu Jan 01 00:00:00 1970 +0000)
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	467 \| \| \| \|
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	468 \| \| x / 0da815c333f6 (5) E
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	469 \| \| /
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	470 x \| \| b868bc49b0a4 (7) fold0
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	471 \|\ \ \ folded(description, parent, content) from 2a34000d3544, c473644ee0e9 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	472 \| \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	473 \| \| x \| d15d0ffc75f6 (8) fold1
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	474 \| \| \|\ \ folded(description, parent, content) from 868d2e0eb19c, a8df460dbbfe using fold by test (Thu Jan 01 00:00:00 1970 +0000)
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	475 \| \| \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	476 \| \| \| \| x d9f908fde1a1 (6) F
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	477 \| \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	478 x \| \| \| 2a34000d3544 (1) A
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	479 / / /
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	480 \| x / 868d2e0eb19c (4) D
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	481 \| /
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	482 \| x a8df460dbbfe (3) C
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	483 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	484 x c473644ee0e9 (2) B
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	485

Mercurial > evolve

annotate tests/test-evolve-obshistory-complex.t @ 5539:452651e69848 stable