evolve: tests/test-evolve-content-divergent-corner-cases.t@d02a7c8cdee5 (annotated)

4481 d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	1	========================================================
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	2	Tests the resolution of content divergence: corner cases
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	3	========================================================
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	4
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	5	This file intend to cover cases that are specific enough to not fit in the
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	6	other cases.
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	7
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	8	$ cat >> $HGRCPATH <<EOF
4481 d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	9	> [alias]
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	10	> glog = log -GT "{rev}:{node\|short} {desc\|firstline}\n ({bookmarks}) [{branch}] {phase}"
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	11	> [defaults]
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	12	> amend=-d "0 0"
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	13	> fold=-d "0 0"
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	14	> [web]
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	15	> push_ssl = false
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	16	> allow_push = *
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	17	> [phases]
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	18	> publish = False
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	19	> [diff]
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	20	> git = 1
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	21	> unified = 0
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	22	> [ui]
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	23	> logtemplate = {rev}:{node\|short}@{branch}({phase}) {desc\|firstline} [{troubles}]\n
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	24	> [extensions]
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	25	> EOF
1806 9f42f819267b evolve: move the extensions to 'hgext3rd' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1630 diff changeset	26	$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	27	$ mkcommit() {
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	28	> echo "$1" > "$1"
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	29	> hg add "$1"
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	30	> hg ci -m "add $1"
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	31	> }
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	32
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	33	$ mkcommits() {
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	34	> for i in $@; do mkcommit $i ; done
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	35	> }
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	36
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	37	Basic test of divergence: two divergent changesets with the same parents
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	38	With --all --any we dedupe the divergent and solve the divergence once
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	39
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	40	$ hg init test1
5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	41	$ cd test1
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	42	$ echo a > a
7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	43	$ hg ci -Aqm "added a"
7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	44	$ echo b > b
7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	45	$ hg ci -Aqm "added b"
7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	46
7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	47	$ hg up .^
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	48	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	49	$ echo bdivergent > bdivergent1
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	50	$ hg ci -Am "divergent"
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	51	adding bdivergent1
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	52	created new head
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	53
7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	54	$ hg up .^
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	55	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	56	$ echo bdivergent > bdivergent2
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	57	$ hg ci -Am "divergent"
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	58	adding bdivergent2
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	59	created new head
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	60
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	61	$ hg prune -s 8374d2ddc3a4 "desc('added b')"
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	62	1 changesets pruned
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	63	$ hg prune -s 593c57f2117e "desc('added b')" --hidden
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	64	1 changesets pruned
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	65	2 new content-divergent changesets
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	66
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	67	$ hg log -G
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	68	@ 3:8374d2ddc3a4@default(draft) divergent [content-divergent]
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	69	\|
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	70	\| * 2:593c57f2117e@default(draft) divergent [content-divergent]
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	71	\|/
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	72	o 0:9092f1db7931@default(draft) added a []
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	73
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	74
3154 406992d0d611 evolve: rename --contentdivergent flag to --content-divergent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3013 diff changeset	75	$ hg evolve --all --any --content-divergent
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	76	merge:[2] divergent
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	77	with: [3] divergent
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	78	base: [1] added b
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	79	updating to "local" side of the conflict: 593c57f2117e
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	80	merging "other" content-divergent changeset '8374d2ddc3a4'
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	81	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3846 f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents Pulkit Goyal <7895pulkit@gmail.com> parents: 3799 diff changeset	82	working directory is now at 45bf1312f454
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	83	$ hg log -G
3846 f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents Pulkit Goyal <7895pulkit@gmail.com> parents: 3799 diff changeset	84	@ 4:45bf1312f454@default(draft) divergent []
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	85	\|
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	86	o 0:9092f1db7931@default(draft) added a []
1467 5c385b812500 evolve: dedupe divergents when running evolve --all --any or evolve --rev Laurent Charignon <lcharignon@fb.com> parents: diff changeset	87
1536 9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	88	Test divergence resolution when it yields to an empty commit (issue4950)
9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	89	cdivergent2 contains the same content than cdivergent1 and they are divergent
9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	90	versions of the revision _c
9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	91
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	92	$ hg up .^
1536 9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	93	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	94	$ mkcommit _c
9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	95	created new head
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	96
7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	97	$ hg up .^
1536 9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	98	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	99	$ mkcommit cdivergent1
9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	100	created new head
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	101
7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	102	$ hg up .^
1536 9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	103	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	104	$ echo "cdivergent1" > cdivergent1
9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	105	$ hg add cdivergent1
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	106	$ hg ci -m "add _c"
1536 9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	107	created new head
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	108
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	109	$ hg log -G
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	110	@ 7:b2ae71172042@default(draft) add _c []
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	111	\|
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	112	\| o 6:e3ff64ce8d4c@default(draft) add cdivergent1 []
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	113	\|/
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	114	\| o 5:48819a835615@default(draft) add _c []
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	115	\|/
3846 f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents Pulkit Goyal <7895pulkit@gmail.com> parents: 3799 diff changeset	116	\| o 4:45bf1312f454@default(draft) divergent []
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	117	\|/
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	118	o 0:9092f1db7931@default(draft) added a []
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	119
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	120
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	121	$ hg prune -s b2ae71172042 48819a835615
1536 9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	122	1 changesets pruned
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	123	$ hg prune -s e3ff64ce8d4c 48819a835615 --hidden
1536 9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	124	1 changesets pruned
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	125	2 new content-divergent changesets
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	126
1536 9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	127	$ hg log -G
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	128	@ 7:b2ae71172042@default(draft) add _c [content-divergent]
1536 9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	129	\|
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	130	\| * 6:e3ff64ce8d4c@default(draft) add cdivergent1 [content-divergent]
1536 9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	131	\|/
3846 f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents Pulkit Goyal <7895pulkit@gmail.com> parents: 3799 diff changeset	132	\| o 4:45bf1312f454@default(draft) divergent []
1536 9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	133	\|/
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	134	o 0:9092f1db7931@default(draft) added a []
1536 9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	135
3154 406992d0d611 evolve: rename --contentdivergent flag to --content-divergent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3013 diff changeset	136	$ hg evolve --all --any --content-divergent
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	137	merge:[6] add cdivergent1
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	138	with: [7] add _c
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	139	base: [5] add _c
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	140	updating to "local" side of the conflict: e3ff64ce8d4c
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	141	merging "other" content-divergent changeset 'b2ae71172042'
1536 9afe9e0191a1 evolve: evolve --divergent failed when merge had nothing to do (issue4950) Laurent Charignon <lcharignon@fb.com> parents: 1467 diff changeset	142	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	143	nothing changed
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	144	working directory is now at e3ff64ce8d4c
7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	145
7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	146	$ cd ..
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	147
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	148	Test None docstring issue of evolve divergent, which caused hg crush
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	149
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	150	$ hg init test2
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	151	$ cd test2
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	152	$ mkcommits _a _b
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	153
7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	154	$ hg up .^
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	155	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	156	$ echo bdivergent > bdivergent11
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	157	$ hg ci -Am "bdivergent"
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	158	adding bdivergent11
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	159	created new head
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	160
7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	161	$ hg up .^
7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	162	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	163	$ echo bdivergent > bdivergent22
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	164	$ hg ci -Am "bdivergent"
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	165	adding bdivergent22
7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	166	created new head
7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	167
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	168	$ hg log -G
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	169	@ 3:6b096fb45070@default(draft) bdivergent []
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	170	\|
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	171	\| o 2:05a6b6a9e633@default(draft) bdivergent []
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	172	\|/
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	173	\| o 1:37445b16603b@default(draft) add _b []
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	174	\|/
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	175	o 0:135f39f4bd78@default(draft) add _a []
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	176
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	177
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	178	$ hg prune -s 6b096fb45070 37445b16603b
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	179	1 changesets pruned
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	180	$ hg prune -s 05a6b6a9e633 37445b16603b --hidden
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	181	1 changesets pruned
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	182	2 new content-divergent changesets
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	183	$ hg log -G
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	184	@ 3:6b096fb45070@default(draft) bdivergent [content-divergent]
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	185	\|
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	186	\| * 2:05a6b6a9e633@default(draft) bdivergent [content-divergent]
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	187	\|/
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	188	o 0:135f39f4bd78@default(draft) add _a []
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	189
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	190
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	191	$ cat >$TESTTMP/test_extension.py << EOF
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	192	> from mercurial import merge
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	193	> origupdate = merge.update
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	194	> def newupdate(args, *kwargs):
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	195	> return origupdate(args, *kwargs)
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	196	> merge.update = newupdate
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	197	> EOF
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	198	$ cat >> $HGRCPATH << EOF
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	199	> [extensions]
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	200	> testextension=$TESTTMP/test_extension.py
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	201	> EOF
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	202	$ hg evolve --all
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	203	nothing to evolve on current working copy parent
3154 406992d0d611 evolve: rename --contentdivergent flag to --content-divergent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3013 diff changeset	204	(do you want to use --content-divergent)
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	205	[2]
3154 406992d0d611 evolve: rename --contentdivergent flag to --content-divergent Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3013 diff changeset	206	$ hg evolve --content-divergent
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	207	merge:[3] bdivergent
037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	208	with: [2] bdivergent
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	209	base: [1] add _b
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	210	merging "other" content-divergent changeset '05a6b6a9e633'
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	211	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3846 f9dad99a90d5 evolve: create a new commit instead of amending one of the divergents Pulkit Goyal <7895pulkit@gmail.com> parents: 3799 diff changeset	212	working directory is now at 73ff357d3975
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	213
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	214	$ cd ..
4481 d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	215
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	216	Test to make sure that evolve don't fall into unrecoverable state (issue6053)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	217	------------------------------------------------------------------------------
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	218
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	219	It happened when two divergent csets has different parent (need relocation)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	220	and resolution parent is obsolete. So this issue triggered when during
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	221	relocation we hit conflicts. So lets make the repo as described.
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	222
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	223	$ hg init localside
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	224	$ cd localside
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	225	$ for ch in a b c d e; do
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	226	> echo $ch > $ch;
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	227	> hg add $ch;
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	228	> hg ci -m "added "$ch;
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	229	> done;
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	230
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	231	$ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	232	@ 4:8d71eadcc9df added e
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	233	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	234	o 3:9150fe93bec6 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	235	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	236	o 2:155349b645be added c
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	237	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	238	o 1:5f6d8a4bf34a added b
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	239	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	240	o 0:9092f1db7931 added a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	241	() [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	242
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	243	$ echo ee > e
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	244	$ hg amend -m "updated e"
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	245	$ hg up 1 -q
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	246
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	247	To make sure we hit conflict while relocating
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	248	$ echo dd > d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	249	$ echo ee > e
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	250	$ hg add d e
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	251	$ hg ci -m "updated e"
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	252	created new head
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	253
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	254	Lets create divergence
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	255	$ hg prune 4 -s . --hidden
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	256	1 changesets pruned
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	257	2 new content-divergent changesets
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	258
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	259	Making obsolete resolution parent
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	260	$ hg prune 3
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	261	1 changesets pruned
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	262	1 new orphan changesets
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	263
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	264	$ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	265	@ 6:de4ea3103326 updated e
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	266	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	267	\| * 5:ff6f7cd76a7c updated e
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	268	\| \| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	269	\| x 3:9150fe93bec6 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	270	\| \| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	271	\| o 2:155349b645be added c
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	272	\|/ () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	273	o 1:5f6d8a4bf34a added b
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	274	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	275	o 0:9092f1db7931 added a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	276	() [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	277
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	278	$ hg evolve --content-divergent --any
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	279	merge:[5] updated e
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	280	with: [6] updated e
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	281	base: [4] added e
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	282	rebasing "other" content-divergent changeset de4ea3103326 on 9150fe93bec6
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	283	merging d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	284	warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	285	fix conflicts and see `hg help evolve.interrupted`
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	286	[1]
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	287
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	288	$ hg diff --no-git --config diff.unified=3
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	289	diff -r 9150fe93bec6 d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	290	--- a/d Thu Jan 01 00:00:00 1970 +0000
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	291	+++ b/d Thu Jan 01 00:00:00 1970 +0000
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	292	@@ -1,1 +1,5 @@
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	293	+<<<<<<< destination: 9150fe93bec6 - test: added d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	294	d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	295	+=======
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	296	+dd
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	297	+>>>>>>> evolving: de4ea3103326 - test: updated e
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	298	diff -r 9150fe93bec6 e
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	299	--- /dev/null Thu Jan 01 00:00:00 1970 +0000
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	300	+++ b/e Thu Jan 01 00:00:00 1970 +0000
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	301	@@ -0,0 +1,1 @@
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	302	+ee
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	303
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	304	$ echo dresolved > d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	305	$ hg res -m
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	306	(no more unresolved files)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	307	continue: hg evolve --continue
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	308
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	309	$ hg evolve --continue
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	310	evolving 6:de4ea3103326 "updated e"
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	311	updating to "local" side of the conflict: ff6f7cd76a7c
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	312	merging "other" content-divergent changeset 'e504bd82de7e'
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	313	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	314	working directory is now at 83b1664a580f
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	315
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	316	$ hg glog -l1
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	317	@ 8:83b1664a580f updated e
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	318	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	319	~
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	320
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	321	$ cd ..

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Wed, 10 Apr 2019 14:32:00 +0200
branch	stable
changeset 4481	d02a7c8cdee5
parent 3846	tests/test-divergent.t@f9dad99a90d5
child 4493	32446b7a6e7c
permissions	-rw-r--r--