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

annotate tests/test-evolve-obshistory-complex.t @ 6190:5c1df14ed456 mercurial-4.7

branching: closing test-compat branch for mercurial-4.7

author	Anton Shestakov <av6@dwimlabs.net>
date	Wed, 23 Feb 2022 17:33:32 +0300
parents	55e9987b8384
children

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
5317 011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5162 5314 diff changeset	73 \|\ rewritten(description, content) from 0da815c333f6 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: 5162 5314 diff changeset	74 \| \| note: folding changesets to test
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5162 5314 diff changeset	75 \| \| rewritten(description, parent, content) from d9f908fde1a1 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	76 \| \| note: folding changesets to test
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 \| 0da815c333f6 (5) E
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	79 /
3219 b73bd280b21c fold: add support for storing a note in obsmarker Pulkit Goyal <7895pulkit@gmail.com> parents: 3217 diff changeset	80 x d9f908fde1a1 (6) F
b73bd280b21c fold: add support for storing a note in obsmarker Pulkit Goyal <7895pulkit@gmail.com> parents: 3217 diff changeset	81
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	82 $ 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	83 @ 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	84 \| 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	85 \| 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	86 \| 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	87 \| 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	88 \| 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	89 \| 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	90 \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	91 \| * 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	92 \| \| 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	93 \| \| 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	94 \| \| 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	95 \| \| 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	96 \| \| 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	97 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	98 \| \| 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	99 \| \| \| 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	100 \| \| \| 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	101 \| \| \| 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	102 \| \| \| 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	103 \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	104 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	105 \| \| \| 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	106 \| \| \| 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: 5159 diff changeset	107 \| \| \| obsolete: rewritten 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	108 \| \| \| 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	109 \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	110 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	111 \|/ / 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	112 \| \| 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: 5159 diff changeset	113 \| \| obsolete: rewritten 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	114 \| \| 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	115 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	116 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	117 \| \| 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	118 \| \| 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: 5159 diff changeset	119 \| \| obsolete: rewritten 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	120 \| \| 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	121 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	122 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	123 \|/ 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	124 \| 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: 5159 diff changeset	125 \| obsolete: rewritten 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	126 \| 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	127 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	128 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	129 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	130 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	131 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	132
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 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	135 ----------
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	136
4298 a98fa6c0d4f3 split: only accept explicit revision through the `-r` option Boris Feld <boris.feld@octobus.net> parents: 4294 diff changeset	137 $ 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	138 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	139 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	140 > N
4294 8974a05a49fa split: rework the prompt to be more standard Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4293 diff changeset	141 > 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	142 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	143 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	144 > EOF
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	145 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	146 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	147 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	148 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	149 new file mode 100644
4777 ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4712 diff changeset	150 examine changes to 'A'? [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	151
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	152 @@ -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	153 +A
4777 ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4712 diff changeset	154 record change 1/2 to 'A'? [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
4777 ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4712 diff changeset	158 examine changes to 'B'? [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	159
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	160 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	161 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	162 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	163 new file mode 100644
4777 ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4712 diff changeset	164 examine changes to 'B'? [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	165
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	166 @@ -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	167 +B
4777 ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4712 diff changeset	168 record this change to 'B'? [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	169
5925 e5250f24eed7 split: adjust "no more change to split" to use plural form Anton Shestakov <av6@dwimlabs.net> parents: 5301 diff changeset	170 no more changes to split
4298 a98fa6c0d4f3 split: only accept explicit revision through the `-r` option Boris Feld <boris.feld@octobus.net> parents: 4294 diff changeset	171 $ 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	172 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	173 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	174 > N
4294 8974a05a49fa split: rework the prompt to be more standard Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4293 diff changeset	175 > 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	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 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	178 > EOF
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	179 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	180 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	181 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	182 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	183 new file mode 100644
4777 ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4712 diff changeset	184 examine changes to 'C'? [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	185
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	186 @@ -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	187 +C
4777 ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4712 diff changeset	188 record change 1/2 to 'C'? [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 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	191 new file mode 100644
4777 ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4712 diff changeset	192 examine changes to 'D'? [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	193
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	194 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	195 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	196 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	197 new file mode 100644
4777 ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4712 diff changeset	198 examine changes to 'D'? [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	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 @@ -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	201 +D
4777 ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4712 diff changeset	202 record this change to 'D'? [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	203
5925 e5250f24eed7 split: adjust "no more change to split" to use plural form Anton Shestakov <av6@dwimlabs.net> parents: 5301 diff changeset	204 no more changes to split
3431 2e703ed1c713 evolve: update output for wider reporting of troubled changesets Martin von Zweigbergk <martinvonz@google.com> parents: 3417 diff changeset	205 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	206 $ 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	207 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	208 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	209 > N
4294 8974a05a49fa split: rework the prompt to be more standard Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4293 diff changeset	210 > 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 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	212 > Y
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	213 > EOF
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	214 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	215 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	216 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	217 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	218 new file mode 100644
4777 ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4712 diff changeset	219 examine changes to 'E'? [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	220
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	221 @@ -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	222 +E
4777 ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4712 diff changeset	223 record change 1/2 to 'E'? [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	224
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/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	226 new file mode 100644
4777 ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4712 diff changeset	227 examine changes to 'F'? [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	228
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	229 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	230 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	231 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	232 new file mode 100644
4777 ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4712 diff changeset	233 examine changes to 'F'? [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 @@ -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	236 +F
4777 ff452675566c test-compat: reverte output change from f802a75da585 (hg-5.1) Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4712 diff changeset	237 record this change to 'F'? [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	238
5925 e5250f24eed7 split: adjust "no more change to split" to use plural form Anton Shestakov <av6@dwimlabs.net> parents: 5301 diff changeset	239 no more changes to split
3431 2e703ed1c713 evolve: update output for wider reporting of troubled changesets Martin von Zweigbergk <martinvonz@google.com> parents: 3417 diff changeset	240 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	241 $ 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	242 @ 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	243 \| 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	244 \| 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	245 \| 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	246 \| 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	247 \| 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	248 \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	249 * 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	250 \| 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	251 \| 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	252 \| 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	253 \| 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	254 \| 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	255 \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	256 \| * 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	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: fold1
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: 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	263 \| \| 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	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: fold1
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	268 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	269 \| \| 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	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
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	272 \| \| \| 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	273 \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	274 \| \| 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	275 \| \| \| 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	276 \| \| \| 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	277 \| \| \| 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	278 \| \| \| 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	279 \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	280 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	281 \| \| \| 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	282 \| \| \| 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	283 \| \| \| 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	284 \| \| \| 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	285 \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	286 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	287 \|/ / 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	288 \| \| 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	289 \| \| 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	290 \| \| 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	291 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	292 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	293 \| \| 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	294 \| \| 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	295 \| \| 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	296 \| \| 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	297 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	298 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	299 \|/ 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	300 \| 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	301 \| 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	302 \| 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	303 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	304 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	305 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	306 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	307 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	308
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	309
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	310 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	311 ----------------
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	312
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	313 $ 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	314 1 changesets pruned
3217 b6ba296532cb prune: add support for storing a note in obsmarker Pulkit Goyal <7895pulkit@gmail.com> parents: 3083 diff changeset	315 $ 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	316 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	317 $ 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	318 @ 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	319 \| 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	320 \| 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	321 \| 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	322 \| 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	323 \| 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	324 \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	325 * 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	326 \| 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	327 \| 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	328 \| 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	329 \| 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	330 \| 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	331 \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	332 \| * 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	333 \| \| 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	334 \| \| 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	335 \| \| 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	336 \| \| 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	337 \| \| 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	338 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	339 \| \| 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	340 \| \| \| 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	341 \| \| \| 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	342 \| \| \| 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	343 \| \| \| 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	344 \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	345 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	346 \| \| \| 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	347 \| \| \| 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	348 \| \| \| 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	349 \| \| \| 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	350 \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	351 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	352 \|/ / 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	353 \| \| 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	354 \| \| 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	355 \| \| 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	356 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	357 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	358 \| \| 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	359 \| \| 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	360 \| \| 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	361 \| \| 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	362 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	363 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	364 \|/ 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	365 \| 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	366 \| 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	367 \| 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	368 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	369 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	370 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	371 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	372 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	373
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	374 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	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
5291 258c0a99c5b0 tests: update section headers and comments in obslog-related tests Anton Shestakov <av6@dwimlabs.net> parents: 5290 diff changeset	377 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	378 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	379
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	380 $ hg obslog 12
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	381 * 7b3290f6e0a0 (12) fold1
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	382 \|\ 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	383 \| \| 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	384 \| \|
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	385 x \| d15d0ffc75f6 (8) fold1
5317 011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5162 5314 diff changeset	386 \|\ \ rewritten(description, parent, content) from 868d2e0eb19c 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: 5162 5314 diff changeset	387 \| \| \| rewritten(description, content) from a8df460dbbfe using fold by test (Thu Jan 01 00:00:00 1970 +0000)
5301 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 \| \| x e036916b63ea (11) fold0
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	390 \| \| \| 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	391 \| \| \|
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	392 x \| \| 868d2e0eb19c (4) D
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 x / a8df460dbbfe (3) C
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	395 /
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	396 x b868bc49b0a4 (7) fold0
5317 011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5162 5314 diff changeset	397 \|\ rewritten(description, content) from 2a34000d3544 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: 5162 5314 diff changeset	398 \| \| rewritten(description, parent, content) from c473644ee0e9 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	399 \| \|
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	400 x \| 2a34000d3544 (1) A
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	401 /
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	402 x c473644ee0e9 (2) B
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
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	405 $ hg obslog 12 --no-origin
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	406 * 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	407 \|\
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	408 x \| d15d0ffc75f6 (8) fold1
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5115 diff changeset	409 \|\ \ 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	410 \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	411 \| \| x e036916b63ea (11) fold0
3566 e6bea259c227 prune: include "operation" metadata in obsmarkers Martin von Zweigbergk <martinvonz@google.com> parents: 3564 diff changeset	412 \| \| \| 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	413 \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	414 x \| \| 868d2e0eb19c (4) D
5162 a7fb433faab6 test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5159 diff changeset	415 / / rewritten(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	416 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	417 x \| a8df460dbbfe (3) C
5162 a7fb433faab6 test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5159 diff changeset	418 / rewritten(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	419 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	420 x b868bc49b0a4 (7) fold0
5123 900668a93629 obslog: use _successorsetverb() in regular obslog too Anton Shestakov <av6@dwimlabs.net> parents: 5115 diff changeset	421 \|\ 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	422 \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	423 x \| 2a34000d3544 (1) A
5162 a7fb433faab6 test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5159 diff changeset	424 / rewritten(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	425 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	426 x c473644ee0e9 (2) B
5162 a7fb433faab6 test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5159 diff changeset	427 rewritten(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	428
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	429 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	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 $ 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	432 o 19e14c8397fc (10) fold0
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	433 \| 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	434 \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	435 \| * 7b3290f6e0a0 (12) fold1
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	436 \| \|\ 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	437 \| \| \| 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	438 \| \| \|
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 \| \| \| @ d4a000f63ee9 (15) fold2
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	440 \| \| \| \| 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	441 \| \| \| \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	442 \| \| \| \| * ec31316faa9d (14) fold2
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	443 \| \| \| \|/\| 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	444 \| \| \| \| \| 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	445 \| \| \| \| \| 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	446 \| \| \| \| \|
2484 262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	447 \| \| \| x \| 100cc25b765f (9) fold2
5317 011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5162 5314 diff changeset	448 \| \| \| \|\ \ rewritten(description, content) from 0da815c333f6 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: 5162 5314 diff changeset	449 \| \| \| \| \| \| note: folding changesets to test
011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5162 5314 diff changeset	450 \| \| \| \| \| \| rewritten(description, parent, content) from d9f908fde1a1 using fold by test (Thu Jan 01 00:00:00 1970 +0000)
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	451 \| \| \| \| \| \| 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	452 \| \| \| \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	453 \| +-------x d0f33db50670 (13) fold1
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	454 \| \| \| \| \| 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	455 \| \| \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	456 +---x \| \| e036916b63ea (11) fold0
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	457 \| \| / / 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	458 \| \| \| \|
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	459 \| \| x / 0da815c333f6 (5) E
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	460 \| \| /
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 x \| \| b868bc49b0a4 (7) fold0
5317 011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5162 5314 diff changeset	462 \|\ \ \ rewritten(description, content) from 2a34000d3544 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: 5162 5314 diff changeset	463 \| \| \| \| rewritten(description, parent, content) from 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	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 \| d15d0ffc75f6 (8) fold1
5317 011b53a9d03c test-compat: merge mercurial-4.8 into mercurial-4.7 Anton Shestakov <av6@dwimlabs.net> parents: 5162 5314 diff changeset	466 \| \| \|\ \ rewritten(description, parent, content) from 868d2e0eb19c 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: 5162 5314 diff changeset	467 \| \| \| \| \| rewritten(description, content) from 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	468 \| \| \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	469 \| \| \| \| 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	470 \| \| \| \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	471 x \| \| \| 2a34000d3544 (1) A
5301 e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	472 / / /
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	473 \| x / 868d2e0eb19c (4) D
e8660b28bfee obslog: makes --origin flag the default Anton Shestakov <av6@dwimlabs.net> parents: 5291 diff changeset	474 \| /
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 \| 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	476 \|
262d684851dc obshistory: add the all option to obslog to show the while obs tree Boris Feld <boris.feld@octobus.net> parents: diff changeset	477 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	478

Mercurial > evolve

annotate tests/test-evolve-obshistory-complex.t @ 6190:5c1df14ed456 mercurial-4.7