mercurial: tests/test-obsolete-divergent.t@9a466b9f9792 (annotated)

18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	1	Test file dedicated to testing the divergent troubles from obsolete changeset.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	2
18644 3e92772d5383 spelling: fix some minor issues found by spell checker Mads Kiilerich <mads@kiilerich.com> parents: 18382 diff changeset	3	This is the most complex troubles from far so we isolate it in a dedicated
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	4	file.
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	5
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	6	Enable obsolete
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	7
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	8	$ cat >> $HGRCPATH << EOF
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	9	> [ui]
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	10	> logtemplate = {rev}:{node\|short} {desc}\n
22955 fab9dda0f2a3 obsolete: update tests to use obsolete options Durham Goode <durham@fb.com> parents: 21789 diff changeset	11	> [experimental]
fab9dda0f2a3 obsolete: update tests to use obsolete options Durham Goode <durham@fb.com> parents: 21789 diff changeset	12	> evolution=createmarkers
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	13	> [alias]
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	14	> debugobsolete = debugobsolete -d '0 0'
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	15	> [phases]
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	16	> publish=False
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	17	> EOF
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	18
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	19
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	20	$ mkcommit() {
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	21	> echo "$1" > "$1"
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	22	> hg add "$1"
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	23	> hg ci -m "$1"
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	24	> }
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	25	$ getid() {
21789 15baed3f24ee branchmap: don't use ui.warn for debug message Matt Mackall <mpm@selenic.com> parents: 21024 diff changeset	26	> hg log --hidden -r "desc('$1')" -T '{node}\n'
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	27	> }
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	28
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	29	setup repo
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	30
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	31	$ hg init reference
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	32	$ cd reference
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	33	$ mkcommit base
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	34	$ mkcommit A_0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	35	$ hg up 0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	36	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	37	$ mkcommit A_1
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	38	created new head
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	39	$ hg up 0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	40	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	41	$ mkcommit A_2
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	42	created new head
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	43	$ hg up 0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	44	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	45	$ cd ..
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	46
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	47
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	48	$ newcase() {
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	49	> hg clone -u 0 -q reference $1
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	50	> cd $1
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	51	> }
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	52
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	53	direct divergence
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	54	-----------------
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	55
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	56	A_1 have two direct and divergent successors A_1 and A_1
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	57
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	58	$ newcase direct
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	59	$ hg debugobsolete `getid A_0` `getid A_1`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	60	$ hg debugobsolete `getid A_0` `getid A_2`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	61	$ hg log -G --hidden
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	62	o 3:392fd25390da A_2
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	63	\|
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	64	\| o 2:82623d38b9ba A_1
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	65	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	66	\| x 1:007dc284c1f8 A_0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	67	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	68	@ 0:d20a80d4def3 base
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	69
18267 5bb610f87d1d clfilter: enforce hidden changeset globally Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18234 diff changeset	70	$ hg debugsuccessorssets --hidden 'all()'
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	71	d20a80d4def3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	72	d20a80d4def3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	73	007dc284c1f8
18365 4148414da120 obsolete: process markers in a stable order Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	74	82623d38b9ba
18069 f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	75	392fd25390da
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	76	82623d38b9ba
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	77	82623d38b9ba
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	78	392fd25390da
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	79	392fd25390da
18071 bea754715961 obsolete: add revset and test for divergent changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18069 diff changeset	80	$ hg log -r 'divergent()'
bea754715961 obsolete: add revset and test for divergent changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18069 diff changeset	81	2:82623d38b9ba A_1
bea754715961 obsolete: add revset and test for divergent changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18069 diff changeset	82	3:392fd25390da A_2
18073 e411fd79ca69 obsolete: refuse to push divergent changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18071 diff changeset	83
e411fd79ca69 obsolete: refuse to push divergent changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18071 diff changeset	84	check that mercurial refuse to push
e411fd79ca69 obsolete: refuse to push divergent changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18071 diff changeset	85
e411fd79ca69 obsolete: refuse to push divergent changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18071 diff changeset	86	$ hg init ../other
e411fd79ca69 obsolete: refuse to push divergent changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18071 diff changeset	87	$ hg push ../other
e411fd79ca69 obsolete: refuse to push divergent changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18071 diff changeset	88	pushing to ../other
e411fd79ca69 obsolete: refuse to push divergent changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18071 diff changeset	89	searching for changes
18104 a2cebd3e4daa clfilter: use filtering in `visibleheads` Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18073 diff changeset	90	abort: push includes divergent changeset: 392fd25390da!
18073 e411fd79ca69 obsolete: refuse to push divergent changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18071 diff changeset	91	[255]
e411fd79ca69 obsolete: refuse to push divergent changeset Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18071 diff changeset	92
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	93	$ cd ..
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	94
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	95
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	96	indirect divergence with known changeset
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	97	-------------------------------------------
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	98
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	99	$ newcase indirect_known
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	100	$ hg debugobsolete `getid A_0` `getid A_1`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	101	$ hg debugobsolete `getid A_0` `getid A_2`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	102	$ mkcommit A_3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	103	created new head
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	104	$ hg debugobsolete `getid A_2` `getid A_3`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	105	$ hg log -G --hidden
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	106	@ 4:01f36c5a8fda A_3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	107	\|
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	108	\| x 3:392fd25390da A_2
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	109	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	110	\| o 2:82623d38b9ba A_1
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	111	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	112	\| x 1:007dc284c1f8 A_0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	113	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	114	o 0:d20a80d4def3 base
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	115
18267 5bb610f87d1d clfilter: enforce hidden changeset globally Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18234 diff changeset	116	$ hg debugsuccessorssets --hidden 'all()'
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	117	d20a80d4def3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	118	d20a80d4def3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	119	007dc284c1f8
18365 4148414da120 obsolete: process markers in a stable order Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	120	82623d38b9ba
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	121	01f36c5a8fda
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	122	82623d38b9ba
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	123	82623d38b9ba
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	124	392fd25390da
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	125	01f36c5a8fda
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	126	01f36c5a8fda
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	127	01f36c5a8fda
18071 bea754715961 obsolete: add revset and test for divergent changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18069 diff changeset	128	$ hg log -r 'divergent()'
bea754715961 obsolete: add revset and test for divergent changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18069 diff changeset	129	2:82623d38b9ba A_1
bea754715961 obsolete: add revset and test for divergent changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18069 diff changeset	130	4:01f36c5a8fda A_3
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	131	$ cd ..
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	132
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	133
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	134	indirect divergence with known changeset
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	135	-------------------------------------------
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	136
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	137	$ newcase indirect_unknown
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	138	$ hg debugobsolete `getid A_0` aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	139	$ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid A_1`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	140	$ hg debugobsolete `getid A_0` `getid A_2`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	141	$ hg log -G --hidden
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	142	o 3:392fd25390da A_2
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	143	\|
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	144	\| o 2:82623d38b9ba A_1
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	145	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	146	\| x 1:007dc284c1f8 A_0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	147	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	148	@ 0:d20a80d4def3 base
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	149
18267 5bb610f87d1d clfilter: enforce hidden changeset globally Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18234 diff changeset	150	$ hg debugsuccessorssets --hidden 'all()'
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	151	d20a80d4def3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	152	d20a80d4def3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	153	007dc284c1f8
18365 4148414da120 obsolete: process markers in a stable order Mads Kiilerich <mads@kiilerich.com> parents: 18267 diff changeset	154	82623d38b9ba
18069 f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	155	392fd25390da
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	156	82623d38b9ba
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	157	82623d38b9ba
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	158	392fd25390da
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	159	392fd25390da
18071 bea754715961 obsolete: add revset and test for divergent changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18069 diff changeset	160	$ hg log -r 'divergent()'
bea754715961 obsolete: add revset and test for divergent changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18069 diff changeset	161	2:82623d38b9ba A_1
bea754715961 obsolete: add revset and test for divergent changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18069 diff changeset	162	3:392fd25390da A_2
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	163	$ cd ..
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	164
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	165	do not take unknown node in account if they are final
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	166	-----------------------------------------------------
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	167
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	168	$ newcase final-unknown
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	169	$ hg debugobsolete `getid A_0` `getid A_1`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	170	$ hg debugobsolete `getid A_1` `getid A_2`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	171	$ hg debugobsolete `getid A_0` bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	172	$ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb cccccccccccccccccccccccccccccccccccccccc
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	173	$ hg debugobsolete `getid A_1` dddddddddddddddddddddddddddddddddddddddd
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	174
18267 5bb610f87d1d clfilter: enforce hidden changeset globally Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18234 diff changeset	175	$ hg debugsuccessorssets --hidden 'desc('A_0')'
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	176	007dc284c1f8
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	177	392fd25390da
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	178
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	179	$ cd ..
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	180
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	181	divergence that converge again is not divergence anymore
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	182	-----------------------------------------------------
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	183
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	184	$ newcase converged_divergence
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	185	$ hg debugobsolete `getid A_0` `getid A_1`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	186	$ hg debugobsolete `getid A_0` `getid A_2`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	187	$ mkcommit A_3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	188	created new head
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	189	$ hg debugobsolete `getid A_1` `getid A_3`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	190	$ hg debugobsolete `getid A_2` `getid A_3`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	191	$ hg log -G --hidden
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	192	@ 4:01f36c5a8fda A_3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	193	\|
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	194	\| x 3:392fd25390da A_2
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	195	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	196	\| x 2:82623d38b9ba A_1
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	197	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	198	\| x 1:007dc284c1f8 A_0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	199	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	200	o 0:d20a80d4def3 base
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	201
18267 5bb610f87d1d clfilter: enforce hidden changeset globally Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18234 diff changeset	202	$ hg debugsuccessorssets --hidden 'all()'
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	203	d20a80d4def3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	204	d20a80d4def3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	205	007dc284c1f8
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	206	01f36c5a8fda
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	207	82623d38b9ba
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	208	01f36c5a8fda
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	209	392fd25390da
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	210	01f36c5a8fda
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	211	01f36c5a8fda
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	212	01f36c5a8fda
18071 bea754715961 obsolete: add revset and test for divergent changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18069 diff changeset	213	$ hg log -r 'divergent()'
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	214	$ cd ..
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	215
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	216	split is not divergences
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	217	-----------------------------
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	218
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	219	$ newcase split
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	220	$ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	221	$ hg log -G --hidden
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	222	o 3:392fd25390da A_2
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	223	\|
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	224	\| o 2:82623d38b9ba A_1
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	225	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	226	\| x 1:007dc284c1f8 A_0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	227	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	228	@ 0:d20a80d4def3 base
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	229
18267 5bb610f87d1d clfilter: enforce hidden changeset globally Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18234 diff changeset	230	$ hg debugsuccessorssets --hidden 'all()'
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	231	d20a80d4def3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	232	d20a80d4def3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	233	007dc284c1f8
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	234	82623d38b9ba 392fd25390da
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	235	82623d38b9ba
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	236	82623d38b9ba
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	237	392fd25390da
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	238	392fd25390da
18071 bea754715961 obsolete: add revset and test for divergent changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18069 diff changeset	239	$ hg log -r 'divergent()'
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	240
21024 7731a2281cf0 spelling: fixes from spell checker Mads Kiilerich <madski@unity3d.com> parents: 18644 diff changeset	241	Even when subsequent rewriting happen
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	242
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	243	$ mkcommit A_3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	244	created new head
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	245	$ hg debugobsolete `getid A_1` `getid A_3`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	246	$ hg up 0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	247	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	248	$ mkcommit A_4
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	249	created new head
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	250	$ hg debugobsolete `getid A_2` `getid A_4`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	251	$ hg up 0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	252	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	253	$ mkcommit A_5
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	254	created new head
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	255	$ hg debugobsolete `getid A_4` `getid A_5`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	256	$ hg log -G --hidden
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	257	@ 6:e442cfc57690 A_5
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	258	\|
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	259	\| x 5:6a411f0d7a0a A_4
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	260	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	261	\| o 4:01f36c5a8fda A_3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	262	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	263	\| x 3:392fd25390da A_2
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	264	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	265	\| x 2:82623d38b9ba A_1
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	266	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	267	\| x 1:007dc284c1f8 A_0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	268	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	269	o 0:d20a80d4def3 base
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	270
18267 5bb610f87d1d clfilter: enforce hidden changeset globally Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18234 diff changeset	271	$ hg debugsuccessorssets --hidden 'all()'
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	272	d20a80d4def3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	273	d20a80d4def3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	274	007dc284c1f8
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	275	01f36c5a8fda e442cfc57690
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	276	82623d38b9ba
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	277	01f36c5a8fda
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	278	392fd25390da
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	279	e442cfc57690
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	280	01f36c5a8fda
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	281	01f36c5a8fda
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	282	6a411f0d7a0a
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	283	e442cfc57690
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	284	e442cfc57690
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	285	e442cfc57690
18071 bea754715961 obsolete: add revset and test for divergent changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18069 diff changeset	286	$ hg log -r 'divergent()'
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	287
18644 3e92772d5383 spelling: fix some minor issues found by spell checker Mads Kiilerich <mads@kiilerich.com> parents: 18382 diff changeset	288	Check more complex obsolescence graft (with divergence)
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	289
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	290	$ mkcommit B_0; hg up 0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	291	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	292	$ hg debugobsolete `getid B_0` `getid A_2`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	293	$ mkcommit A_7; hg up 0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	294	created new head
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	295	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	296	$ mkcommit A_8; hg up 0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	297	created new head
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	298	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	299	$ hg debugobsolete `getid A_5` `getid A_7` `getid A_8`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	300	$ mkcommit A_9; hg up 0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	301	created new head
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	302	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	303	$ hg debugobsolete `getid A_5` `getid A_9`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	304	$ hg log -G --hidden
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	305	o 10:bed64f5d2f5a A_9
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	306	\|
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	307	\| o 9:14608b260df8 A_8
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	308	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	309	\| o 8:7ae126973a96 A_7
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	310	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	311	\| x 7:3750ebee865d B_0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	312	\| \|
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	313	\| x 6:e442cfc57690 A_5
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	314	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	315	\| x 5:6a411f0d7a0a A_4
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	316	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	317	\| o 4:01f36c5a8fda A_3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	318	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	319	\| x 3:392fd25390da A_2
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	320	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	321	\| x 2:82623d38b9ba A_1
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	322	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	323	\| x 1:007dc284c1f8 A_0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	324	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	325	@ 0:d20a80d4def3 base
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	326
18267 5bb610f87d1d clfilter: enforce hidden changeset globally Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18234 diff changeset	327	$ hg debugsuccessorssets --hidden 'all()'
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	328	d20a80d4def3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	329	d20a80d4def3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	330	007dc284c1f8
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	331	01f36c5a8fda bed64f5d2f5a
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	332	01f36c5a8fda 7ae126973a96 14608b260df8
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	333	82623d38b9ba
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	334	01f36c5a8fda
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	335	392fd25390da
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	336	bed64f5d2f5a
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	337	7ae126973a96 14608b260df8
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	338	01f36c5a8fda
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	339	01f36c5a8fda
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	340	6a411f0d7a0a
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	341	bed64f5d2f5a
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	342	7ae126973a96 14608b260df8
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	343	e442cfc57690
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	344	bed64f5d2f5a
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	345	7ae126973a96 14608b260df8
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	346	3750ebee865d
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	347	bed64f5d2f5a
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	348	7ae126973a96 14608b260df8
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	349	7ae126973a96
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	350	7ae126973a96
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	351	14608b260df8
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	352	14608b260df8
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	353	bed64f5d2f5a
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	354	bed64f5d2f5a
18071 bea754715961 obsolete: add revset and test for divergent changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18069 diff changeset	355	$ hg log -r 'divergent()'
bea754715961 obsolete: add revset and test for divergent changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18069 diff changeset	356	4:01f36c5a8fda A_3
bea754715961 obsolete: add revset and test for divergent changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18069 diff changeset	357	8:7ae126973a96 A_7
bea754715961 obsolete: add revset and test for divergent changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18069 diff changeset	358	9:14608b260df8 A_8
bea754715961 obsolete: add revset and test for divergent changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18069 diff changeset	359	10:bed64f5d2f5a A_9
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	360
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	361	fix the divergence
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	362
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	363	$ mkcommit A_A; hg up 0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	364	created new head
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	365	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	366	$ hg debugobsolete `getid A_9` `getid A_A`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	367	$ hg debugobsolete `getid A_7` `getid A_A`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	368	$ hg debugobsolete `getid A_8` `getid A_A`
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	369	$ hg log -G --hidden
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	370	o 11:a139f71be9da A_A
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	371	\|
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	372	\| x 10:bed64f5d2f5a A_9
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	373	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	374	\| x 9:14608b260df8 A_8
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	375	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	376	\| x 8:7ae126973a96 A_7
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	377	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	378	\| x 7:3750ebee865d B_0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	379	\| \|
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	380	\| x 6:e442cfc57690 A_5
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	381	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	382	\| x 5:6a411f0d7a0a A_4
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	383	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	384	\| o 4:01f36c5a8fda A_3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	385	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	386	\| x 3:392fd25390da A_2
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	387	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	388	\| x 2:82623d38b9ba A_1
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	389	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	390	\| x 1:007dc284c1f8 A_0
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	391	\|/
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	392	@ 0:d20a80d4def3 base
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	393
18267 5bb610f87d1d clfilter: enforce hidden changeset globally Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18234 diff changeset	394	$ hg debugsuccessorssets --hidden 'all()'
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	395	d20a80d4def3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	396	d20a80d4def3
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	397	007dc284c1f8
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	398	01f36c5a8fda a139f71be9da
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	399	82623d38b9ba
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	400	01f36c5a8fda
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	401	392fd25390da
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	402	a139f71be9da
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	403	01f36c5a8fda
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	404	01f36c5a8fda
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	405	6a411f0d7a0a
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	406	a139f71be9da
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	407	e442cfc57690
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	408	a139f71be9da
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	409	3750ebee865d
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	410	a139f71be9da
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	411	7ae126973a96
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	412	a139f71be9da
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	413	14608b260df8
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	414	a139f71be9da
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	415	bed64f5d2f5a
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	416	a139f71be9da
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	417	a139f71be9da
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	418	a139f71be9da
18071 bea754715961 obsolete: add revset and test for divergent changesets Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 18069 diff changeset	419	$ hg log -r 'divergent()'
18068 4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	420
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	421	$ cd ..
4bec77e62c00 obsolete: compute successors set Pierre-Yves David <pierre-yves.david@logilab.fr> parents: diff changeset	422
18069 f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	423
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	424	Subset does not diverge
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	425	------------------------------
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	426
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	427	Do not report divergent successors-set if it is a subset of another
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	428	successors-set. (report [A,B] not [A] + [A,B])
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	429
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	430	$ newcase subset
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	431	$ hg debugobsolete `getid A_0` `getid A_2`
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	432	$ hg debugobsolete `getid A_0` `getid A_1` `getid A_2`
18267 5bb610f87d1d clfilter: enforce hidden changeset globally Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18234 diff changeset	433	$ hg debugsuccessorssets --hidden 'desc('A_0')'
18069 f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	434	007dc284c1f8
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	435	82623d38b9ba 392fd25390da
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	436
f84e731cbd20 obsolete: drop successors sets which are subset of another one Pierre-Yves David <pierre-yves.david@logilab.fr> parents: 18068 diff changeset	437	$ cd ..

author	Matt Harbison <matt_harbison@yahoo.com>
	Tue, 29 Sep 2015 23:29:44 -0400
branch	stable
changeset 26417	9a466b9f9792
parent 22955	fab9dda0f2a3
child 33274	68f3e819d41d
permissions	-rw-r--r--