evolve: tests/test-evolve-content-divergent-basic.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: basic 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 basic case of content divergence. See the other test
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	6	file for more advanced 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
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	88
7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	89	$ cd ..
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	90
4481 d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	91	Extra setup
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	92	-----------
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	93
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	94	(the test below were initially in a different file)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	95
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	96	$ hg init cdiv
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	97	$ cd cdiv
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	98	$ echo ".*\.orig" > .hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	99	$ hg add .hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	100	$ hg ci -m "added hgignore"
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	101	$ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done;
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	102
4481 d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	103	$ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	104	@ 4:c41c793e0ef1 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	105	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	106	o 3:ca1b80f7960a added c
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	107	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	108	o 2:b1661037fa25 added b
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	109	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	110	o 1:c7586e2a9264 added a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	111	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	112	o 0:8fa14d15e168 added hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	113	() [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	114
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	115	Merging branch difference
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	116	-------------------------
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	117
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	118	Creating content-divergence with branch change where base, divergent and other
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	119	have different branches
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	120
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	121	$ hg branch -r . foobar
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	122	changed branch on 1 changesets
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	123
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	124	$ hg up c41c793e0ef1 --hidden
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	125	0 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	126	updated to hidden changeset c41c793e0ef1
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	127	(hidden revision 'c41c793e0ef1' was rewritten as: 9e5dffcb3d48)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	128	working directory parent is obsolete! (c41c793e0ef1)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	129	(use 'hg evolve' to update to its successor: 9e5dffcb3d48)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	130	$ echo bar > d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	131	$ hg branch watwat
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	132	marked working directory as branch watwat
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	133	$ hg amend
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	134	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	135
4481 d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	136	$ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	137	@ 6:264b04f771fb added d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	138	\| () [watwat] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	139	\| * 5:9e5dffcb3d48 added d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	140	\|/ () [foobar] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	141	o 3:ca1b80f7960a added c
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	142	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	143	o 2:b1661037fa25 added b
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	144	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	145	o 1:c7586e2a9264 added a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	146	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	147	o 0:8fa14d15e168 added hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	148	() [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	149
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	150	$ hg evolve --content-divergent --config ui.interactive=True<<EOF
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	151	> c
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	152	> EOF
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	153	merge:[6] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	154	with: [5] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	155	base: [4] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	156	merging "other" content-divergent changeset '9e5dffcb3d48'
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	157	0 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	158	content divergent changesets on different branches.
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	159	choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar? c
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	160	working directory is now at 0ac42f1bc15c
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	161
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	162	$ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	163	@ 7:0ac42f1bc15c added d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	164	\| () [foobar] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	165	o 3:ca1b80f7960a added c
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	166	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	167	o 2:b1661037fa25 added b
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	168	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	169	o 1:c7586e2a9264 added a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	170	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	171	o 0:8fa14d15e168 added hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	172	() [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	173
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	174	Testing merging of commit messages
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	175	-----------------------------------
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	176
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	177	When base and one of the divergent has same commit messages and other divergent
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	178	has different one
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	179
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	180	$ echo wat > d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	181	$ hg amend
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	182
7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	183	$ hg up .^
7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	184	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	185
4481 d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	186	$ echo bar > d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	187	$ hg ci -Aqm "added a d with bar in it, expect some beers"
3799 037ccbf41c6d tests: make sure we don't result in commit messages conflict Pulkit Goyal <7895pulkit@gmail.com> parents: 3798 diff changeset	188
4481 d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	189	$ hg prune -r 0ac42f1bc15c -s . --hidden
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	190	1 changesets pruned
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	191	2 new content-divergent changesets
4481 d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	192
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	193	$ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	194	@ 9:59081c9c425a added a d with bar in it, expect some beers
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	195	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	196	\| * 8:f621d00f5f0e added d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	197	\|/ () [foobar] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	198	o 3:ca1b80f7960a added c
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	199	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	200	o 2:b1661037fa25 added b
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	201	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	202	o 1:c7586e2a9264 added a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	203	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	204	o 0:8fa14d15e168 added hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	205	() [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	206
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	207	$ hg evolve --content-divergent
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	208	merge:[9] added a d with bar in it, expect some beers
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	209	with: [8] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	210	base: [7] added d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	211	merging "other" content-divergent changeset 'f621d00f5f0e'
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	212	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	213	working directory is now at a9d6fd6b5e40
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	214
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	215	$ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	216	@ 10:a9d6fd6b5e40 added a d with bar in it, expect some beers
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	217	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	218	o 3:ca1b80f7960a added c
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	219	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	220	o 2:b1661037fa25 added b
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	221	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	222	o 1:c7586e2a9264 added a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	223	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	224	o 0:8fa14d15e168 added hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	225	() [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	226
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	227	When base has different message and both divergents has same one
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	228
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	229	$ echo foo > d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	230	$ hg amend -m "foo to d"
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	231
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	232	$ hg up a9d6fd6b5e40 --hidden
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	233	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	234	updated to hidden changeset a9d6fd6b5e40
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	235	(hidden revision 'a9d6fd6b5e40' was rewritten as: b10b07a394f1)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	236	working directory parent is obsolete! (a9d6fd6b5e40)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	237	(use 'hg evolve' to update to its successor: b10b07a394f1)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	238	$ echo babar > d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	239	$ hg amend -m "foo to d"
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	240	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	241
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	242	$ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	243	@ 12:0bb497fed24a foo to d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	244	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	245	\| * 11:b10b07a394f1 foo to d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	246	\|/ () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	247	o 3:ca1b80f7960a added c
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	248	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	249	o 2:b1661037fa25 added b
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	250	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	251	o 1:c7586e2a9264 added a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	252	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	253	o 0:8fa14d15e168 added hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	254	() [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	255
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	256	$ hg evolve --content-divergent
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	257	merge:[12] foo to d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	258	with: [11] foo to d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	259	base: [10] added a d with bar in it, expect some beers
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	260	merging "other" content-divergent changeset 'b10b07a394f1'
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	261	merging d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	262	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	263	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	264	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	265	[1]
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	266
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	267	$ echo foobar > d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	268	$ hg resolve -m
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	269	(no more unresolved files)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	270	continue: hg evolve --continue
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	271	$ hg evolve --continue
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	272	working directory is now at 11175423b5dc
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	273
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	274	$ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	275	@ 13:11175423b5dc foo to d
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	o 3:ca1b80f7960a added c
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	278	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	279	o 2:b1661037fa25 added b
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	280	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	281	o 1:c7586e2a9264 added a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	282	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	283	o 0:8fa14d15e168 added hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	284	() [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	285
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	286	When all three base, divergent and other has different commit messages creating
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	287	conflicts
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	288
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	289	$ echo bar > d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	290	$ hg amend -m "bar to d, expect beers"
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	291
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	292	$ hg up 11175423b5dc --hidden
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	293	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	294	updated to hidden changeset 11175423b5dc
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	295	(hidden revision '11175423b5dc' was rewritten as: 27f0463f169a)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	296	working directory parent is obsolete! (11175423b5dc)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	297	(use 'hg evolve' to update to its successor: 27f0463f169a)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	298	$ echo wat > d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	299	$ hg amend -m "wat to d, wat?"
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	300	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	301
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	302	$ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	303	@ 15:f542037ddf31 wat to d, wat?
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	304	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	305	\| * 14:27f0463f169a bar to d, expect beers
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	306	\|/ () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	307	o 3:ca1b80f7960a added c
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	308	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	309	o 2:b1661037fa25 added b
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	310	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	311	o 1:c7586e2a9264 added a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	312	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	313	o 0:8fa14d15e168 added hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	314	() [default] draft
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 evolve --content-divergent
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	317	merge:[15] wat to d, wat?
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	318	with: [14] bar to d, expect beers
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	319	base: [13] foo to d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	320	merging "other" content-divergent changeset '27f0463f169a'
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	321	merging d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	322	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	323	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	324	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	325	[1]
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	326
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	327	$ echo watbar > d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	328	$ hg resolve -m
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	329	(no more unresolved files)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	330	continue: hg evolve --continue
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	331
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	332	$ cat > editor.sh <<EOF
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	333	> #!/bin/sh
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	334	> printf "showing editors text\n\n"
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	335	> cat \$1
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	336	> printf "\ndone showing editors text\n\n"
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	337	> cat > \$1 <<ENDOF
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	338	> watbar to d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	339	> ENDOF
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	340	> EOF
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	341
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	342	$ HGEDITOR='sh ./editor.sh' hg evolve --continue
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	343	showing editors text
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	344
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	345	HG: Conflicts while merging changeset description of content-divergent changesets.
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	346	HG: Resolve conflicts in commit messages to continue.
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	347
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	348	<<<<<<< divergent
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	349	wat to d, wat?\|\|\|\|\|\|\| base
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	350	foo to d=======
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	351	bar to d, expect beers>>>>>>> other
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	352
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	353	done showing editors text
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	354
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	355	working directory is now at 89ea3eee2d69
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	356
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	357	$ hg glog
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	358	@ 16:89ea3eee2d69 watbar to d
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	359	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	360	o 3:ca1b80f7960a added c
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	361	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	362	o 2:b1661037fa25 added b
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	363	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	364	o 1:c7586e2a9264 added a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	365	\| () [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	366	o 0:8fa14d15e168 added hgignore
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	367	() [default] draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	368
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	369	$ cd ..
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	370
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	371	Stabilize divergent changesets with same parent
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	372	===============================================
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	373
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	374	$ glog() {
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	375	> hg log -G --template \
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	376	> '{rev}:{node\|short}@{branch}({phase}) bk:[{bookmarks}] {desc\|firstline}\n' "$@"
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	377	> }
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	378
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	379	$ hg init content-divergent-savanna
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	380	$ cd content-divergent-savanna
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	381	$ echo a > a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	382	$ hg add a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	383	$ hg ci -m 'root'
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	384	$ hg phase --public .
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	385	$ cat << EOF >> a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	386	> flore
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	387	> arthur
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	388	> zephir
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	389	> some
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	390	> less
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	391	> conflict
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	392	> EOF
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	393	$ hg ci -m 'More addition'
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	394	$ glog
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	395	@ 1:867e43582046@default(draft) bk:[] More addition
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	396	\|
4481 d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	397	o 0:6569b5a81c7e@default(public) bk:[] root
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	398
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	399	$ echo 'babar' >> a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	400	$ hg amend
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	401	$ hg up --hidden 'min(desc("More addition"))'
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	402	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	403	updated to hidden changeset 867e43582046
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	404	(hidden revision '867e43582046' was rewritten as: fc6349f931da)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	405	working directory parent is obsolete! (867e43582046)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	406	(use 'hg evolve' to update to its successor: fc6349f931da)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	407	$ mv a a.old
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	408	$ echo 'jungle' > a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	409	$ cat a.old >> a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	410	$ rm a.old
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	411	$ hg amend
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	412	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	413	$ glog
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	414	@ 3:051337a45e7c@default(draft) bk:[] More addition
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	415	\|
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	416	\| * 2:fc6349f931da@default(draft) bk:[] More addition
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	417	\|/
4481 d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	418	o 0:6569b5a81c7e@default(public) bk:[] root
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	419
3798 7c05ee4a8cc7 tests: don't use mkcommit shell function in test-divergent.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3787 diff changeset	420
4481 d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	421	Stabilize it
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	422
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	423	$ hg evolve -qn --confirm --content-divergent
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	424	merge:[3] More addition
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	425	with: [2] More addition
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	426	base: [1] More addition
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	427	perform evolve? [Ny] n
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	428	abort: evolve aborted by user
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	429	[255]
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	430	$ echo y \| hg evolve -qn --confirm --config ui.interactive=True --content-divergent
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	431	merge:[3] More addition
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	432	with: [2] More addition
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	433	base: [1] More addition
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	434	perform evolve? [Ny] y
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	435	hg update -c 051337a45e7c &&
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	436	hg merge fc6349f931da &&
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	437	hg commit -m "auto merge resolving conflict between 051337a45e7c and fc6349f931da"&&
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	438	hg up -C 867e43582046 &&
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	439	hg revert --all --rev tip &&
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	440	hg commit -m "`hg log -r 051337a45e7c --template={desc}`";
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	441	$ hg evolve -v --content-divergent
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	442	merge:[3] More addition
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	443	with: [2] More addition
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	444	base: [1] More addition
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	445	merging "other" content-divergent changeset 'fc6349f931da'
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	446	resolving manifests
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	447	merging a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	448	0 files updated, 1 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	449	committing files:
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	450	a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	451	committing manifest
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	452	committing changelog
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	453	working directory is now at 5bf84d1d71d1
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	454	$ hg st
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	455	$ glog
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	456	@ 4:5bf84d1d71d1@default(draft) bk:[] More addition
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	457	\|
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	458	o 0:6569b5a81c7e@default(public) bk:[] root
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	459
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	460	$ hg summary
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	461	parent: 4:5bf84d1d71d1 tip
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	462	More addition
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	463	branch: default
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	464	commit: (clean)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	465	update: (current)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	466	phases: 1 draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	467	$ hg export . --config diff.unified=3
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	468	# HG changeset patch
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	469	# User test
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	470	# Date 0 0
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	471	# 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	472	# Node ID 5bf84d1d71d12f451bfe1e09b93045eb6338cd6c
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	473	# Parent 6569b5a81c7e307ddc076550e8c0f6d75b6effcd
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	474	More addition
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	475
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	476	diff --git a/a b/a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	477	--- a/a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	478	+++ b/a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	479	@@ -1,1 +1,9 @@
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	480	+jungle
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	481	a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	482	+flore
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	483	+arthur
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	484	+zephir
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	485	+some
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	486	+less
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	487	+conflict
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	488	+babar
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	489
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	490	Check conflict during divergence resolution
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	491	-------------------------------------------------
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	492
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	493	$ hg up --hidden 'min(desc("More addition"))'
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	494	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	495	updated to hidden changeset 867e43582046
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	496	(hidden revision '867e43582046' was rewritten as: 5bf84d1d71d1)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	497	working directory parent is obsolete! (867e43582046)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	498	(use 'hg evolve' to update to its successor: 5bf84d1d71d1)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	499	$ echo 'gotta break' >> a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	500	$ hg amend
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	501	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	502	# reamend so that the case is not the first precursor.
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	503	$ hg amend -m "More addition (2)"
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	504	$ hg phase 'contentdivergent()'
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	505	4: draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	506	6: draft
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	507
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	508	$ glog
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	509	@ 6:13c1b75640a1@default(draft) bk:[] More addition (2)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	510	\|
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	511	\| * 4:5bf84d1d71d1@default(draft) bk:[] More addition
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	512	\|/
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	513	o 0:6569b5a81c7e@default(public) bk:[] root
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	514
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	515
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	516	$ hg evolve -qn --content-divergent
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	517	hg update -c 13c1b75640a1 &&
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	518	hg merge 5bf84d1d71d1 &&
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	519	hg commit -m "auto merge resolving conflict between 13c1b75640a1 and 5bf84d1d71d1"&&
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	520	hg up -C 867e43582046 &&
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	521	hg revert --all --rev tip &&
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	522	hg commit -m "`hg log -r 13c1b75640a1 --template={desc}`";
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	523	$ hg evolve --content-divergent
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	524	merge:[6] More addition (2)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	525	with: [4] More addition
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	526	base: [1] More addition
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	527	merging "other" content-divergent changeset '5bf84d1d71d1'
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	528	merging a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	529	warning: conflicts while merging a! (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	530	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	531	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	532	[1]
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	533
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	534	$ cat > a <<EOF
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	535	> jungle
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	536	> a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	537	> flore
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	538	> arthur
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	539	> zephir
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	540	> some
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	541	> less
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	542	> conflict
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	543	> babar
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	544	> EOF
35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	545
4481 d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	546	$ hg resolve -m
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	547	(no more unresolved files)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	548	continue: hg evolve --continue
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	549	$ hg evolve --continue
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	550	working directory is now at 2346e1147fed
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	551	$ glog
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	552	@ 7:2346e1147fed@default(draft) bk:[] More addition (2)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	553	\|
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	554	o 0:6569b5a81c7e@default(public) bk:[] root
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	555
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	556	$ hg exp --config diff.unified=3
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	557	# HG changeset patch
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	558	# User test
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	559	# Date 0 0
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	560	# 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	561	# Node ID 2346e1147fedc8c9aa17f9ba7870dcd8be52f567
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	562	# Parent 6569b5a81c7e307ddc076550e8c0f6d75b6effcd
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	563	More addition (2)
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	564
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	565	diff --git a/a b/a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	566	--- a/a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	567	+++ b/a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	568	@@ -1,1 +1,9 @@
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	569	+jungle
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	570	a
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	571	+flore
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	572	+arthur
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	573	+zephir
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	574	+some
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	575	+less
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	576	+conflict
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3846 diff changeset	577	+babar
1630 35c666ef724e evolve: Fix crush when reading docstring Juntao Li <juntaoli@fb.com> parents: 1536 diff changeset	578	$ 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 4490	7a5c6109ee84
permissions	-rw-r--r--