evolve: tests/test-unstable.t@b92114f201c9 (annotated)

1479 72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	1	$ cat >> $HGRCPATH <<EOF
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	2	> [defaults]
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	3	> amend=-d "0 0"
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	4	> fold=-d "0 0"
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	5	> [web]
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	6	> push_ssl = false
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	7	> allow_push = *
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	8	> [phases]
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	9	> publish = False
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	10	> [diff]
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	11	> git = 1
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	12	> unified = 0
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	13	> [ui]
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	14	> logtemplate = {rev}:{node\|short}@{branch}({phase}) {desc\|firstline}\n
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	15	> [extensions]
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	16	> EOF
1806 9f42f819267b evolve: move the extensions to 'hgext3rd' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1639 diff changeset	17	$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
1479 72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	18	$ mkcommit() {
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	19	> echo "$1" > "$1"
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	20	> hg add "$1"
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	21	> hg ci -m "add $1"
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	22	> }
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	23
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	24	$ mkstack() {
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	25	> # Creates a stack of commit based on $1 with messages from $2, $3 ..
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	26	> hg update "$1" -C
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	27	> shift
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	28	> mkcommits $*
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	29	> }
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	30
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	31	$ mkcommits() {
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	32	> for i in $@; do mkcommit $i ; done
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	33	> }
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	34
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	35	==============================================================================
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	36	Test instability resolution for a changeset unstable because its parent
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	37	is obsolete with one successor
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	38	==============================================================================
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	39	$ hg init test1
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	40	$ cd test1
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	41	$ mkcommits _a _b _c
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	42	$ hg up "desc(_b)"
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	43	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	44	$ hg amend -m "bprime"
3106 a867d59ea97a test-compat: revert output changes from phase renaming Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3013 diff changeset	45	1 new unstable changesets
1479 72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	46	$ hg log -G
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	47	@ 3:36050226a9b9@default(draft) bprime
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	48	\|
3411 e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3359 diff changeset	49	\| o 2:102002290587@default(draft) add _c
1479 72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	50	\| \|
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	51	\| x 1:37445b16603b@default(draft) add _b
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	52	\|/
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	53	o 0:135f39f4bd78@default(draft) add _a
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	54
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	55
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2776 diff changeset	56	$ hg evo --all --any --orphan
1479 72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	57	move:[2] add _c
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	58	atop:[3] bprime
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	59	working directory is now at fdcf3523a74d
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	60	$ hg log -G
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	61	@ 4:fdcf3523a74d@default(draft) add _c
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	62	\|
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	63	o 3:36050226a9b9@default(draft) bprime
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	64	\|
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	65	o 0:135f39f4bd78@default(draft) add _a
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	66
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	67
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	68	$ cd ..
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	69
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	70	===============================================================================
3593 b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	71	Test instability resolution for a merge changeset unstable because one
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	72	of its parent is obsolete
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	73	Not supported yet
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	74	==============================================================================
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	75
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	76	$ hg init test2
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	77	$ cd test2
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	78	$ mkcommit base
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	79	$ mkcommits _a
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	80	$ hg up "desc(base)"
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	81	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	82	$ mkcommit _c
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	83	created new head
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	84	$ hg merge "desc(_a)" >/dev/null
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	85	$ hg commit -m "merge"
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	86	$ hg up "desc(_a)"
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	87	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	88	$ hg amend -m "aprime"
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	89	1 new unstable changesets
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	90	$ hg log -G
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	91	@ 4:47127ea62e5f@default(draft) aprime
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	92	\|
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	93	\| o 3:6b4280e33286@default(draft) merge
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	94	\| \|\
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	95	+---o 2:474da87dd33b@default(draft) add _c
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	96	\| \|
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	97	\| x 1:b3264cec9506@default(draft) add _a
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	98	\|/
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	99	o 0:b4952fcf48cf@default(draft) add base
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	100
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	101
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	102	$ hg evo --all --any --orphan
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	103	move:[3] merge
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	104	atop:[4] aprime
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	105	working directory is now at 0bf3f3a59c8c
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	106	$ hg log -G
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	107	@ 5:0bf3f3a59c8c@default(draft) merge
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	108	\|\
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	109	\| o 4:47127ea62e5f@default(draft) aprime
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	110	\| \|
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	111	o \| 2:474da87dd33b@default(draft) add _c
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	112	\|/
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	113	o 0:b4952fcf48cf@default(draft) add base
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	114
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	115
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	116	$ cd ..
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	117
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	118	===============================================================================
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	119	Test instability resolution for a merge changeset unstable because both
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	120	of its parent are obsolete
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	121	Not supported yet
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	122	==============================================================================
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	123
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	124	$ hg init test3
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	125	$ cd test3
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	126	$ mkcommit base
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	127	$ mkcommits _a
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	128	$ hg up "desc(base)"
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	129	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	130	$ mkcommit _c
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	131	created new head
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	132	$ hg merge "desc(_a)" >/dev/null
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	133	$ hg commit -m "merge"
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	134	$ hg up "desc(_a)"
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	135	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	136	$ hg amend -m "aprime"
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	137	1 new unstable changesets
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	138	$ hg up "desc(_c)"
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	139	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	140	$ hg amend -m "cprime"
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	141	$ hg log -G
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	142	@ 5:2db39fda7e2f@default(draft) cprime
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	143	\|
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	144	\| o 4:47127ea62e5f@default(draft) aprime
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	145	\|/
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	146	\| o 3:6b4280e33286@default(draft) merge
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	147	\| \|\
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	148	+---x 2:474da87dd33b@default(draft) add _c
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	149	\| \|
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	150	\| x 1:b3264cec9506@default(draft) add _a
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	151	\|/
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	152	o 0:b4952fcf48cf@default(draft) add base
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	153
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	154
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	155	$ hg evo --all --any --orphan
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	156	move:[3] merge
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	157	atop:[4] aprime
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	158	move:[6] merge
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	159	atop:[5] cprime
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	160	working directory is now at 2d30b910830b
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	161	$ hg log -G
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	162	@ 7:2d30b910830b@default(draft) merge
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	163	\|\
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	164	\| o 5:2db39fda7e2f@default(draft) cprime
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	165	\| \|
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	166	o \| 4:47127ea62e5f@default(draft) aprime
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	167	\|/
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	168	o 0:b4952fcf48cf@default(draft) add base
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	169
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	170
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	171	$ cd ..
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	172
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	173	===============================================================================
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	174	Test instability resolution for a changeset unstable because its parent
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	175	is obsolete with multiple successors all in one chain (simple split)
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	176	==============================================================================
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	177
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	178	$ hg init test4
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	179	$ cd test4
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	180	$ mkcommits _a _b _c
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	181	$ hg up "desc(_a)"
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	182	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	183	$ mkcommits bprimesplit1 bprimesplit2
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	184	created new head
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	185	$ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	186	1 changesets pruned
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	187	1 new unstable changesets
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	188	$ hg log -G
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	189	@ 4:2a4ccc0bb20c@default(draft) add bprimesplit2
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	190	\|
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	191	o 3:8b87864bd0f4@default(draft) add bprimesplit1
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	192	\|
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	193	\| o 2:102002290587@default(draft) add _c
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	194	\| \|
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	195	\| x 1:37445b16603b@default(draft) add _b
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	196	\|/
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	197	o 0:135f39f4bd78@default(draft) add _a
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	198
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	199
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	200	$ hg evo --all --any --orphan
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	201	move:[2] add _c
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	202	atop:[4] add bprimesplit2
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	203	working directory is now at 387cc1e837d7
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	204	$ hg log -G
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	205	@ 5:387cc1e837d7@default(draft) add _c
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	206	\|
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	207	o 4:2a4ccc0bb20c@default(draft) add bprimesplit2
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	208	\|
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	209	o 3:8b87864bd0f4@default(draft) add bprimesplit1
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	210	\|
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	211	o 0:135f39f4bd78@default(draft) add _a
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	212
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	213
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	214
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	215	$ cd ..
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	216
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	217	===============================================================================
1479 72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	218	Test instability resolution for a changeset unstable because its parent
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	219	is obsolete with multiple successors on one branches but in reverse
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	220	order (cross-split).
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	221	==============================================================================
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	222
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	223	$ hg init test5
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	224	$ cd test5
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	225	$ mkcommits _a _b _c
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	226	$ hg up "desc(_a)"
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	227	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	228	$ mkcommits bprimesplit1 bprimesplit2
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	229	created new head
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	230	$ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	231	1 changesets pruned
3106 a867d59ea97a test-compat: revert output changes from phase renaming Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3013 diff changeset	232	1 new unstable changesets
1479 72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	233	$ hg up "desc(_a)"
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	234	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	235	$ mkcommits bsecondsplit1 bsecondsplit2
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	236	created new head
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	237	$ hg prune "desc(bprimesplit1)" -s "desc(bsecondsplit2)"
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	238	1 changesets pruned
3106 a867d59ea97a test-compat: revert output changes from phase renaming Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3013 diff changeset	239	1 new unstable changesets
1479 72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	240	$ hg prune "desc(bprimesplit2)" -s "desc(bsecondsplit1)"
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	241	1 changesets pruned
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	242	$ hg log -G
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	243	@ 6:59b942dbda14@default(draft) add bsecondsplit2
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	244	\|
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	245	o 5:8ffdae67d696@default(draft) add bsecondsplit1
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	246	\|
3411 e1f3e43a50a4 branching: backed out test output changes from core-1905aac253f0 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3359 diff changeset	247	\| o 2:102002290587@default(draft) add _c
1479 72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	248	\| \|
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	249	\| x 1:37445b16603b@default(draft) add _b
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	250	\|/
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	251	o 0:135f39f4bd78@default(draft) add _a
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	252
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	253
2834 38db1466c6fb log: unstable was renamed into orphan Boris Feld <boris.feld@octobus.net> parents: 2776 diff changeset	254	$ hg evo --all --any --orphan
1481 3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1479 diff changeset	255	move:[2] add _c
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1479 diff changeset	256	atop:[6] add bsecondsplit2
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1479 diff changeset	257	working directory is now at 98e3f21461ff
1479 72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	258	$ hg log -G
1481 3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1479 diff changeset	259	@ 7:98e3f21461ff@default(draft) add _c
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1479 diff changeset	260	\|
3c0aebe73482 evolve: handle split commit for instability Laurent Charignon <lcharignon@fb.com> parents: 1479 diff changeset	261	o 6:59b942dbda14@default(draft) add bsecondsplit2
1479 72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	262	\|
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	263	o 5:8ffdae67d696@default(draft) add bsecondsplit1
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	264	\|
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	265	o 0:135f39f4bd78@default(draft) add _a
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	266
72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	267
3593 b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	268
1479 72eab894a89d evolve: add test for instability Laurent Charignon <lcharignon@fb.com> parents: diff changeset	269	$ cd ..
3593 b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	270
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	271	===============================================================================
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	272	Test instability resolution for a changeset unstable because its parent
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	273	is obsolete with multiple successors on two branches.
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	274	Not supported yet
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	275	==============================================================================
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	276
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	277	$ hg init test6
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	278	$ cd test6
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	279	$ mkcommits _a _b _c
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	280	$ hg up "desc(_a)"
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	281	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	282	$ mkcommit bprimesplit1
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	283	created new head
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	284	$ hg up "desc(_a)"
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	285	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	286	$ mkcommit bprimesplit2
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	287	created new head
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	288	$ hg prune "desc(_b)" -s "desc(bprimesplit1) + desc(bprimesplit2)" --split
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	289	1 changesets pruned
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	290	1 new unstable changesets
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	291	$ hg log -G
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	292	@ 4:3c69ea6aa93e@default(draft) add bprimesplit2
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	293	\|
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	294	\| o 3:8b87864bd0f4@default(draft) add bprimesplit1
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	295	\|/
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	296	\| o 2:102002290587@default(draft) add _c
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	297	\| \|
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	298	\| x 1:37445b16603b@default(draft) add _b
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	299	\|/
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	300	o 0:135f39f4bd78@default(draft) add _a
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	301
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	302
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	303	$ hg evo --all --any --orphan
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	304	could not solve instability, ambiguous destination: parent split across two branches
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	305	$ hg log -G
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	306	@ 4:3c69ea6aa93e@default(draft) add bprimesplit2
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	307	\|
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	308	\| o 3:8b87864bd0f4@default(draft) add bprimesplit1
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	309	\|/
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	310	\| o 2:102002290587@default(draft) add _c
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	311	\| \|
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	312	\| x 1:37445b16603b@default(draft) add _b
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	313	\|/
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	314	o 0:135f39f4bd78@default(draft) add _a
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	315
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	316
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	317
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	318	$ cd ..
b92114f201c9 test-compat: merge mercurial-4.2 into mercurial-4.1 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3591 diff changeset	319

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Wed, 21 Mar 2018 16:35:18 +0100
branch	mercurial-4.1
changeset 3593	b92114f201c9
parent 3591	98941c28f3e2
permissions	-rw-r--r--