evolve: tests/test-evolve-content-divergent-stack.t@93c49ff40981 (annotated)

4481 d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4424 diff changeset	1	=================================================
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4424 diff changeset	2	Tests the resolution of content divergence: stack
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4424 diff changeset	3	=================================================
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4424 diff changeset	4
d02a7c8cdee5 test: consolidate the content-divergent test cases Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4424 diff changeset	5	This file intend to cover case with stacks of divergent changesets
3790 5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	6
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	7	$ cat >> $HGRCPATH <<EOF
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	8	> [alias]
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	9	> glog = log -GT "{rev}:{node\|short} {desc\|firstline}\n ({bookmarks}) [{branch}] {phase}"
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	10	> [phases]
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	11	> publish = False
3790 5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	12	> [extensions]
3804 509b1e66f0b9 tests: add tests for resolving content-divergence with parent change Pulkit Goyal <7895pulkit@gmail.com> parents: 3802 diff changeset	13	> rebase =
3790 5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	14	> EOF
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	15	$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
5b9e3aaa6da8 evolve: prompt user for branch selection while resolving content-divergence Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	16
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	17	Resolving content-divergence of a stack with same parents
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	18	---------------------------------------------------------
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	19
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	20	$ hg init stacktest
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	21	$ cd stacktest
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	22	$ echo ".*\.orig" > .hgignore
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	23	$ hg add .hgignore
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	24	$ hg ci -m "added hgignore"
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	25	$ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done;
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	26
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	27	$ hg glog
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	28	@ 4:c41c793e0ef1 added d
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	29	\| () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	30	o 3:ca1b80f7960a added c
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	31	\| () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	32	o 2:b1661037fa25 added b
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	33	\| () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	34	o 1:c7586e2a9264 added a
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	35	\| () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	36	o 0:8fa14d15e168 added hgignore
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	37	() [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	38
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	39	$ cd ..
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	40	$ hg init stack2
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	41	$ cd stack2
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	42	$ hg pull ../stacktest
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	43	pulling from ../stacktest
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	44	requesting all changes
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	45	adding changesets
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	46	adding manifests
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	47	adding file changes
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	48	added 5 changesets with 5 changes to 5 files
4181 ab3581bc0637 branching: preserve the expected output on default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4165 diff changeset	49	new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts)
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	50	(run 'hg update' to get a working copy)
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	51	$ hg glog
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	52	o 4:c41c793e0ef1 added d
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	53	\| () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	54	o 3:ca1b80f7960a added c
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	55	\| () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	56	o 2:b1661037fa25 added b
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	57	\| () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	58	o 1:c7586e2a9264 added a
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	59	\| () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	60	o 0:8fa14d15e168 added hgignore
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	61	() [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	62
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	63	$ hg up c7586e2a9264
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	64	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	65	$ echo bar > a
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	66	$ hg amend -m "watbar to a"
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	67	3 new orphan changesets
3849 a17d4934c5ce tests: fix a test case to not create conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	68	$ echo wat > a
a17d4934c5ce tests: fix a test case to not create conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	69	$ hg amend -m "watbar to a"
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	70	$ hg evolve --all
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	71	move:[2] added b
3849 a17d4934c5ce tests: fix a test case to not create conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	72	atop:[6] watbar to a
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	73	move:[3] added c
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	74	move:[4] added d
3849 a17d4934c5ce tests: fix a test case to not create conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	75	working directory is now at 15c781f93cac
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	76	$ hg glog
3849 a17d4934c5ce tests: fix a test case to not create conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	77	@ 9:15c781f93cac added d
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	78	\| () [default] draft
3849 a17d4934c5ce tests: fix a test case to not create conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	79	o 8:9e5fb1d5b955 added c
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	80	\| () [default] draft
3849 a17d4934c5ce tests: fix a test case to not create conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	81	o 7:88516dccf68a added b
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	82	\| () [default] draft
3849 a17d4934c5ce tests: fix a test case to not create conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	83	o 6:82b74d5dc678 watbar to a
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	84	\| () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	85	o 0:8fa14d15e168 added hgignore
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	86	() [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	87
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	88	$ cd ../stacktest
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	89	$ hg up .^^^
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	90	0 files updated, 0 files merged, 3 files removed, 0 files unresolved
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	91	$ echo wat > a
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	92	$ hg amend -m "watbar to a"
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	93	3 new orphan changesets
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	94	$ hg evolve --all
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	95	move:[2] added b
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	96	atop:[5] watbar to a
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	97	move:[3] added c
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	98	move:[4] added d
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	99	working directory is now at c72d2885eb51
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	100	$ hg glog
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	101	@ 8:c72d2885eb51 added d
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	102	\| () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	103	o 7:3ce4be6d8e5e added c
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	104	\| () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	105	o 6:d5f148423c16 added b
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	106	\| () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	107	o 5:8e222f257bbf watbar to a
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	108	\| () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	109	o 0:8fa14d15e168 added hgignore
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	110	() [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	111
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	112	$ hg pull ../stack2
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	113	pulling from ../stack2
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	114	searching for changes
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	115	adding changesets
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	116	adding manifests
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	117	adding file changes
3849 a17d4934c5ce tests: fix a test case to not create conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	118	added 4 changesets with 0 changes to 4 files (+1 heads)
a17d4934c5ce tests: fix a test case to not create conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	119	5 new obsolescence markers
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	120	8 new content-divergent changesets
4181 ab3581bc0637 branching: preserve the expected output on default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4165 diff changeset	121	new changesets 82b74d5dc678:15c781f93cac (4 drafts)
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	122	(run 'hg heads' to see heads, 'hg merge' to merge)
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	123
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	124	$ hg glog
3849 a17d4934c5ce tests: fix a test case to not create conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	125	* 12:15c781f93cac added d
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	126	\| () [default] draft
3849 a17d4934c5ce tests: fix a test case to not create conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	127	* 11:9e5fb1d5b955 added c
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	128	\| () [default] draft
3849 a17d4934c5ce tests: fix a test case to not create conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	129	* 10:88516dccf68a added b
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	130	\| () [default] draft
3849 a17d4934c5ce tests: fix a test case to not create conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	131	* 9:82b74d5dc678 watbar to a
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	132	\| () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	133	\| @ 8:c72d2885eb51 added d
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	134	\| \| () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	135	\| * 7:3ce4be6d8e5e added c
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	136	\| \| () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	137	\| * 6:d5f148423c16 added b
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	138	\| \| () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	139	\| * 5:8e222f257bbf watbar to a
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	140	\|/ () [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	141	o 0:8fa14d15e168 added hgignore
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	142	() [default] draft
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	143
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	144	$ hg evolve --all --content-divergent
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	145	merge:[5] watbar to a
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	146	with: [9] watbar to a
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	147	base: [1] added a
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	148	updating to "local" side of the conflict: 8e222f257bbf
3849 a17d4934c5ce tests: fix a test case to not create conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	149	merging "other" content-divergent changeset '82b74d5dc678'
a17d4934c5ce tests: fix a test case to not create conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	150	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	151	6 new orphan changesets
3850 340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	152	merge:[6] added b
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	153	with: [10] added b
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	154	base: [2] added b
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	155	updating to "local" side of the conflict: d5f148423c16
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	156	merging "other" content-divergent changeset '88516dccf68a'
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	157	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	158	merge:[7] added c
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	159	with: [11] added c
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	160	base: [3] added c
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	161	updating to "local" side of the conflict: 3ce4be6d8e5e
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	162	merging "other" content-divergent changeset '9e5fb1d5b955'
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	163	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	164	merge:[8] added d
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	165	with: [12] added d
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	166	base: [4] added d
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	167	updating to "local" side of the conflict: c72d2885eb51
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	168	merging "other" content-divergent changeset '15c781f93cac'
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	169	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	170	working directory is now at 038fe7db3d88
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	171
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	172	$ hg glog
3850 340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	173	@ 16:038fe7db3d88 added d
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	174	\| () [default] draft
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	175	o 15:b2cac10f3836 added c
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	176	\| () [default] draft
3850 340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	177	o 14:eadfd9d70680 added b
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	178	\| () [default] draft
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	179	o 13:f66f262fff6c watbar to a
340cf6fbe9e9 evolve: create resolved cset on successors of current parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3849 diff changeset	180	\| () [default] draft
3844 48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	181	o 0:8fa14d15e168 added hgignore
48fbccfd1dff tests: add test of resolution of content-divergent stacks Pulkit Goyal <7895pulkit@gmail.com> parents: 3842 diff changeset	182	() [default] draft
4441 f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	183	Resolving content-divergence of a stack with different parents
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	184	---------------------------------------------------------
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	185
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	186	$ cd ..
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	187	$ hg init stackrepo1
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	188	$ cd stackrepo1
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	189	$ echo ".*\.orig" > .hgignore
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	190	$ hg add .hgignore
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	191	$ hg ci -m "added hgignore"
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	192
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	193	$ for ch in a b c d;
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	194	> do echo foo > $ch;
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	195	> hg add $ch;
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	196	> hg ci -qm "added "$ch;
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	197	> done;
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	198
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	199	$ hg glog
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	200	@ 4:c41c793e0ef1 added d
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	201	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	202	o 3:ca1b80f7960a added c
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	203	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	204	o 2:b1661037fa25 added b
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	205	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	206	o 1:c7586e2a9264 added a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	207	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	208	o 0:8fa14d15e168 added hgignore
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	209	() [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	210
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	211	$ cd ..
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	212	$ hg init stackrepo2
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	213	$ cd stackrepo2
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	214	$ hg pull ../stackrepo1
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	215	pulling from ../stackrepo1
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	216	requesting all changes
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	217	adding changesets
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	218	adding manifests
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	219	adding file changes
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	220	added 5 changesets with 5 changes to 5 files
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	221	new changesets 8fa14d15e168:c41c793e0ef1 (5 drafts)
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	222	(run 'hg update' to get a working copy)
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	223
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	224	$ hg glog
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	225	o 4:c41c793e0ef1 added d
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	226	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	227	o 3:ca1b80f7960a added c
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	228	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	229	o 2:b1661037fa25 added b
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	230	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	231	o 1:c7586e2a9264 added a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	232	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	233	o 0:8fa14d15e168 added hgignore
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	234	() [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	235
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	236	$ hg up 8fa14d15e168
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	237	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	238	$ echo newfile > newfile
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	239	$ hg ci -Am "add newfile"
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	240	adding newfile
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	241	created new head
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	242	$ hg rebase -s c7586e2a9264 -d .
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	243	rebasing 1:c7586e2a9264 "added a"
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	244	rebasing 2:b1661037fa25 "added b"
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	245	rebasing 3:ca1b80f7960a "added c"
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	246	rebasing 4:c41c793e0ef1 "added d"
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	247
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	248	$ hg glog
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	249	o 9:d45f050514c2 added d
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	250	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	251	o 8:8ed612937375 added c
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	252	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	253	o 7:6eb54b5af3fb added b
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	254	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	255	o 6:c04ff147ef79 added a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	256	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	257	@ 5:2228e3b74514 add newfile
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	258	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	259	o 0:8fa14d15e168 added hgignore
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	260	() [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	261
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	262	$ cd ../stackrepo1
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	263	$ hg up .^^^
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	264	0 files updated, 0 files merged, 3 files removed, 0 files unresolved
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	265	$ echo wat > a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	266	$ hg amend -m "watbar to a"
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	267	3 new orphan changesets
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	268	$ hg evolve --all
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	269	move:[2] added b
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	270	atop:[5] watbar to a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	271	move:[3] added c
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	272	move:[4] added d
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	273	working directory is now at c72d2885eb51
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	274
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	275	$ hg glog
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	276	@ 8:c72d2885eb51 added d
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	277	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	278	o 7:3ce4be6d8e5e added c
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	279	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	280	o 6:d5f148423c16 added b
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	281	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	282	o 5:8e222f257bbf watbar to a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	283	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	284	o 0:8fa14d15e168 added hgignore
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	285	() [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	286
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	287	$ hg pull ../stackrepo2
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	288	pulling from ../stackrepo2
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	289	searching for changes
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	290	adding changesets
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	291	adding manifests
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	292	adding file changes
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	293	added 5 changesets with 1 changes to 5 files (+1 heads)
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	294	4 new obsolescence markers
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	295	8 new content-divergent changesets
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	296	new changesets 2228e3b74514:d45f050514c2 (5 drafts)
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	297	(run 'hg heads' to see heads, 'hg merge' to merge)
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	298
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	299	$ hg glog
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	300	* 13:d45f050514c2 added d
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	301	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	302	* 12:8ed612937375 added c
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	303	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	304	* 11:6eb54b5af3fb added b
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	305	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	306	* 10:c04ff147ef79 added a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	307	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	308	o 9:2228e3b74514 add newfile
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	309	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	310	\| @ 8:c72d2885eb51 added d
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	311	\| \| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	312	\| * 7:3ce4be6d8e5e added c
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	313	\| \| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	314	\| * 6:d5f148423c16 added b
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	315	\| \| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	316	\| * 5:8e222f257bbf watbar to a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	317	\|/ () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	318	o 0:8fa14d15e168 added hgignore
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	319	() [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	320
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	321	$ hg evolve --all --content-divergent
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	322	merge:[10] added a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	323	with: [5] watbar to a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	324	base: [1] added a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	325	rebasing "other" content-divergent changeset 8e222f257bbf on 2228e3b74514
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	326	updating to "local" side of the conflict: c04ff147ef79
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	327	merging "other" content-divergent changeset '186bdc2cdfa2'
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	328	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	329	6 new orphan changesets
4442 819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	330	merge:[11] added b
819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	331	with: [6] added b
4441 f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	332	base: [2] added b
4442 819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	333	rebasing "other" content-divergent changeset d5f148423c16 on c04ff147ef79
819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	334	updating to "local" side of the conflict: 6eb54b5af3fb
819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	335	merging "other" content-divergent changeset '8542f15656e7'
819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	336	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	337	merge:[12] added c
819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	338	with: [7] added c
4441 f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	339	base: [3] added c
4442 819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	340	rebasing "other" content-divergent changeset 3ce4be6d8e5e on 6eb54b5af3fb
819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	341	updating to "local" side of the conflict: 8ed612937375
819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	342	merging "other" content-divergent changeset 'a690ce53104a'
819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	343	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	344	merge:[13] added d
819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	345	with: [8] added d
4441 f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	346	base: [4] added d
4442 819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	347	rebasing "other" content-divergent changeset c72d2885eb51 on 8ed612937375
819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	348	updating to "local" side of the conflict: d45f050514c2
819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	349	merging "other" content-divergent changeset '1d1772990a3b'
819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	350	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	351	working directory is now at 5f7a38bdb75c
4441 f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	352
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	353	$ hg glog
4442 819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	354	@ 21:5f7a38bdb75c added d
4441 f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	355	\| () [default] draft
4442 819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	356	o 19:9865d598f0e0 added c
4441 f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	357	\| () [default] draft
4442 819bad275701 evolve: add logic to handle a particular case in divergence resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4441 diff changeset	358	o 17:ac70b8c8eb63 added b
4441 f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	359	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	360	o 15:74fbf3e6a0b6 watbar to a
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	361	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	362	o 9:2228e3b74514 add newfile
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	363	\| () [default] draft
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	364	o 0:8fa14d15e168 added hgignore
f606eab8dff8 evolve: add a test reflecting wrong behaviour of content-div resolution Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4428 diff changeset	365	() [default] draft
4419 1fdecdfd0df9 evolve: add test which shows unrecoverable evolve state (issue6053) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4181 diff changeset	366	$ cd ..

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Wed, 17 Apr 2019 20:52:15 +0200
branch	mercurial-4.9
changeset 4523	93c49ff40981
parent 4490	7a5c6109ee84
child 4512	7a779a288793
child 4577	bcd52ce0916d
permissions	-rw-r--r--