evolve: tests/test-evolve-abort-contentdiv.t@537fd9a86c06 (annotated)

3773 958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	1	Tests for the --abort flag for `hg evolve` command while content-divergence resolution
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	2	======================================================================================
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	3
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	4	The `--abort` flag aborts the interuppted evolve by undoing all the work which
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	5	was done during resolution i.e. stripping new changesets created, moving
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	6	bookmarks back, moving working directory back.
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	7
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	8	This test contains cases when `hg evolve` is doing content-divergence resolution.
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	9
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	10	Setup
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	11	=====
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	12
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	13	$ cat >> $HGRCPATH <<EOF
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	14	> [phases]
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	15	> publish = False
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	16	> [alias]
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	17	> glog = log -GT "{rev}:{node\|short} {desc}\n ({bookmarks}) {phase}"
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	18	> [extensions]
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	19	> EOF
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	20	$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	21
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	22	$ hg init abortrepo
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	23	$ cd abortrepo
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	24	$ echo ".*\.orig" > .hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	25	$ hg add .hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	26	$ hg ci -m "added hgignore"
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	27	$ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done;
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	28
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	29	$ hg glog
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	30	@ 4:c41c793e0ef1 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	31	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	32	o 3:ca1b80f7960a added c
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	33	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	34	o 2:b1661037fa25 added b
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	35	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	36	o 1:c7586e2a9264 added a
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	37	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	38	o 0:8fa14d15e168 added hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	39	() draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	40
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	41	Creating content divergence, resolution of which will lead to conflicts
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	42	-----------------------------------------------------------------------
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	43
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	44	$ echo bar > d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	45	$ hg amend
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	46
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	47	$ hg up c41c793e0ef1 --hidden
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	48	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	49	working directory parent is obsolete! (c41c793e0ef1)
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	50	(use 'hg evolve' to update to its successor: e49523854bc8)
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	51
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	52	$ echo foobar > d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	53	$ hg amend
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	54	2 new divergent changesets
3773 958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	55	$ hg glog --hidden
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	56	@ 8:9c1631e352d9 added d
3773 958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	57	\| () draft
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	58	\| x 7:48ce7f604829 temporary amend commit for c41c793e0ef1
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	59	\| \| () draft
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	60	+---o 6:e49523854bc8 added d
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	61	\| \| () draft
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	62	\| \| x 5:14721514d41c temporary amend commit for c41c793e0ef1
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	63	\| \|/ () draft
3773 958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	64	\| x 4:c41c793e0ef1 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	65	\|/ () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	66	o 3:ca1b80f7960a added c
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	67	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	68	o 2:b1661037fa25 added b
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	69	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	70	o 1:c7586e2a9264 added a
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	71	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	72	o 0:8fa14d15e168 added hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	73	() draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	74
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	75	$ hg evolve --content-divergent
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	76	merge:[8] added d
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	77	with: [6] added d
3773 958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	78	base: [4] added d
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	79	merging "other" divergent changeset 'e49523854bc8'
3773 958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	80	merging d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	81	warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	82	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
3852 629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	83	fix conflicts and see `hg help evolve.interrupted`
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	84	[1]
3773 958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	85
3839 ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886) Pulkit Goyal <7895pulkit@gmail.com> parents: 3832 diff changeset	86	$ hg status -v
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886) Pulkit Goyal <7895pulkit@gmail.com> parents: 3832 diff changeset	87	M d
ac0717f23921 evolve: show unfinished information in `hg status -v` (issue5886) Pulkit Goyal <7895pulkit@gmail.com> parents: 3832 diff changeset	88
3773 958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	89	$ hg evolve --abort
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	90	evolve aborted
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	91	working directory is now at 9c1631e352d9
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	92
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	93	$ hg glog --hidden
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	94	@ 8:9c1631e352d9 added d
3773 958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	95	\| () draft
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	96	\| x 7:48ce7f604829 temporary amend commit for c41c793e0ef1
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	97	\| \| () draft
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	98	+---o 6:e49523854bc8 added d
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	99	\| \| () draft
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	100	\| \| x 5:14721514d41c temporary amend commit for c41c793e0ef1
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	101	\| \|/ () draft
3773 958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	102	\| x 4:c41c793e0ef1 added d
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	103	\|/ () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	104	o 3:ca1b80f7960a added c
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	105	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	106	o 2:b1661037fa25 added b
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	107	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	108	o 1:c7586e2a9264 added a
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	109	\| () draft
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	110	o 0:8fa14d15e168 added hgignore
958dad74e877 tests: add tests for testing --abort while content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	111	() draft
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	112
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	113	Creating multiple content-divergence where resolution of last one results in
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	114	conflicts and resolution of first one resulted in no new commit
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	115	-----------------------------------------------------------------------------
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	116
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	117	$ echo watbar > d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	118	$ hg amend
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	119	$ hg up .^
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	120	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	121	$ echo bar > c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	122	$ hg amend
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	123	2 new unstable changesets
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	124	$ hg up ca1b80f7960a --hidden
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	125	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	126	working directory parent is obsolete! (ca1b80f7960a)
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	127	(use 'hg evolve' to update to its successor: 2ba73e31f264)
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	128	$ echo foobar > c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	129	$ hg amend
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	130	2 new divergent changesets
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	131	$ echo bar > c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	132	$ hg amend
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	133
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	134	$ hg glog --hidden
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	135	@ 16:491e10505bae added c
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	136	\| () draft
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	137	\| x 15:b2451992ec73 temporary amend commit for 7398f702a162
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	138	\| \| () draft
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	139	\| x 14:7398f702a162 added c
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	140	\|/ () draft
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	141	\| x 13:1c0d5c8e745f temporary amend commit for ca1b80f7960a
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	142	\| \| () draft
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	143	+---o 12:2ba73e31f264 added c
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	144	\| \| () draft
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	145	\| \| x 11:277fdfc7d90c temporary amend commit for ca1b80f7960a
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	146	\| \|/ () draft
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	147	\| \| o 10:f0f1694f123e added d
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	148	\| \|/ () draft
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	149	\| \| x 9:36f1dead57ef temporary amend commit for 9c1631e352d9
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	150	\| \| \| () draft
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	151	\| \| x 8:9c1631e352d9 added d
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	152	\| \|/ () draft
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	153	\| \| x 7:48ce7f604829 temporary amend commit for c41c793e0ef1
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	154	\| \| \| () draft
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	155	\| +---o 6:e49523854bc8 added d
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	156	\| \| \| () draft
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	157	\| \| \| x 5:14721514d41c temporary amend commit for c41c793e0ef1
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	158	\| \| \|/ () draft
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	159	\| \| x 4:c41c793e0ef1 added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	160	\| \|/ () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	161	\| x 3:ca1b80f7960a added c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	162	\|/ () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	163	o 2:b1661037fa25 added b
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	164	\| () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	165	o 1:c7586e2a9264 added a
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	166	\| () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	167	o 0:8fa14d15e168 added hgignore
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	168	() draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	169
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	170	$ hg evolve --all --content-divergent
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	171	merge:[12] added c
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	172	with: [16] added c
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	173	base: [3] added c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	174	updating to "local" side of the conflict: 2ba73e31f264
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	175	merging "other" divergent changeset '491e10505bae'
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	176	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	177	merge:[6] added d
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	178	with: [10] added d
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	179	base: [4] added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	180	updating to "local" side of the conflict: e49523854bc8
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	181	merging "other" divergent changeset 'f0f1694f123e'
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	182	merging d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	183	warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	184	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
3852 629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	185	fix conflicts and see `hg help evolve.interrupted`
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	186	[1]
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	187
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	188	$ hg evolve --abort
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	189	evolve aborted
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	190	working directory is now at 491e10505bae
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	191
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	192	$ hg glog --hidden
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	193	@ 16:491e10505bae added c
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	194	\| () draft
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	195	\| x 15:b2451992ec73 temporary amend commit for 7398f702a162
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	196	\| \| () draft
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	197	\| x 14:7398f702a162 added c
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	198	\|/ () draft
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	199	\| x 13:1c0d5c8e745f temporary amend commit for ca1b80f7960a
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	200	\| \| () draft
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	201	+---o 12:2ba73e31f264 added c
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	202	\| \| () draft
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	203	\| \| x 11:277fdfc7d90c temporary amend commit for ca1b80f7960a
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	204	\| \|/ () draft
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	205	\| \| o 10:f0f1694f123e added d
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	206	\| \|/ () draft
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	207	\| \| x 9:36f1dead57ef temporary amend commit for 9c1631e352d9
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	208	\| \| \| () draft
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	209	\| \| x 8:9c1631e352d9 added d
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	210	\| \|/ () draft
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	211	\| \| x 7:48ce7f604829 temporary amend commit for c41c793e0ef1
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	212	\| \| \| () draft
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	213	\| +---o 6:e49523854bc8 added d
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	214	\| \| \| () draft
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	215	\| \| \| x 5:14721514d41c temporary amend commit for c41c793e0ef1
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	216	\| \| \|/ () draft
3791 63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	217	\| \| x 4:c41c793e0ef1 added d
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	218	\| \|/ () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	219	\| x 3:ca1b80f7960a added c
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	220	\|/ () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	221	o 2:b1661037fa25 added b
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	222	\| () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	223	o 1:c7586e2a9264 added a
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	224	\| () draft
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	225	o 0:8fa14d15e168 added hgignore
63d6d024dfb2 tests: add more test of --abort flag for content-divergence resolution Pulkit Goyal <7895pulkit@gmail.com> parents: 3773 diff changeset	226	() draft
3792 bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	227
bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	228	$ hg obslog -r . --all
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	229	o 2ba73e31f264 (12) added c
3832 fb821ed44f86 evolve: strip the extra obsmarkers if any on `hg evolve --abort` Pulkit Goyal <7895pulkit@gmail.com> parents: 3792 diff changeset	230	\|
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	231	\| @ 491e10505bae (16) added c
3792 bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	232	\| \|
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	233	\| x 7398f702a162 (14) added c
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	234	\|/ rewritten(content) as 491e10505bae by test (Thu Jan 01 00:00:00 1970 +0000)
3792 bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	235	\|
bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	236	x ca1b80f7960a (3) added c
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	237	rewritten(content) as 2ba73e31f264 by test (Thu Jan 01 00:00:00 1970 +0000)
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	238	rewritten(content) as 7398f702a162 by test (Thu Jan 01 00:00:00 1970 +0000)
3792 bb7d1616407f evolve: return the new node formed only as the replacement Pulkit Goyal <7895pulkit@gmail.com> parents: 3791 diff changeset	239
3841 82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	240	$ cd ..
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	241
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	242	Creating content-divergence on multiple parents when gca of divergent changesets
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	243	is parent of one of the divergents and relocating leads to conflicts
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	244	---------------------------------------------------------------------------------
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	245
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	246	$ hg init multiparent
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	247	$ cd multiparent
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	248	$ echo ".*\.orig" > .hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	249	$ hg add .hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	250	$ hg ci -m "added hgignore"
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	251	$ for ch in a b c d; do echo foo > $ch; hg add $ch; hg ci -qm "added "$ch; done;
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	252
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	253	$ hg glog
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	254	@ 4:c41c793e0ef1 added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	255	\| () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	256	o 3:ca1b80f7960a added c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	257	\| () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	258	o 2:b1661037fa25 added b
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	259	\| () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	260	o 1:c7586e2a9264 added a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	261	\| () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	262	o 0:8fa14d15e168 added hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	263	() draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	264
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	265	$ hg rebase -r . -d .^^^ --config extensions.rebase=
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	266	rebasing 4:c41c793e0ef1 "added d" (tip)
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	267	$ echo bar > c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	268	$ hg add c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	269	$ hg amend
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	270
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	271	$ hg up --hidden c41c793e0ef1
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	272	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	273	working directory parent is obsolete! (c41c793e0ef1)
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	274	(use 'hg evolve' to update to its successor: 69bdd23a9b0d)
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	275	$ echo bar > d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	276	$ hg amend
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	277	2 new divergent changesets
3841 82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	278
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	279	$ hg glog
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	280	@ 9:e49523854bc8 added d
3841 82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	281	\| () draft
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	282	\| o 7:69bdd23a9b0d added d
3841 82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	283	\| \| () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	284	o \| 3:ca1b80f7960a added c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	285	\| \| () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	286	o \| 2:b1661037fa25 added b
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	287	\|/ () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	288	o 1:c7586e2a9264 added a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	289	\| () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	290	o 0:8fa14d15e168 added hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	291	() draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	292
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	293	$ hg evolve --content-divergent
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	294	merge:[9] added d
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	295	with: [7] added d
3841 82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	296	base: [4] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	297	rebasing "other" content-divergent changeset 69bdd23a9b0d on ca1b80f7960a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	298	merging c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	299	warning: conflicts while merging c! (edit, then use 'hg resolve --mark')
3853 796334340cad evolve: make one missed error to align other error messages Pulkit Goyal <7895pulkit@gmail.com> parents: 3852 diff changeset	300	fix conflicts and see `hg help evolve.interrupted`
796334340cad evolve: make one missed error to align other error messages Pulkit Goyal <7895pulkit@gmail.com> parents: 3852 diff changeset	301	[1]
3841 82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	302
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	303	$ hg evolve --abort
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	304	evolve aborted
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	305	working directory is now at e49523854bc8
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	306
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	307	$ hg glog
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	308	@ 9:e49523854bc8 added d
3841 82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	309	\| () draft
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	310	\| o 7:69bdd23a9b0d added d
3841 82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	311	\| \| () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	312	o \| 3:ca1b80f7960a added c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	313	\| \| () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	314	o \| 2:b1661037fa25 added b
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	315	\|/ () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	316	o 1:c7586e2a9264 added a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	317	\| () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	318	o 0:8fa14d15e168 added hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	319	() draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	320
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	321	Creating content-divergence on multiple parents when gca of divergent changesets
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	322	is parent of one of the divergents and merging divergent leads to conflicts
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	323	---------------------------------------------------------------------------------
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	324
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	325	$ hg up 69bdd23a9b0d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	326	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	327	$ hg rm c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	328	$ echo wat > d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	329	$ hg amend
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	330
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	331	$ hg glog
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	332	@ 11:33e4442acf98 added d
3841 82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	333	\| () draft
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	334	\| o 9:e49523854bc8 added d
3841 82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	335	\| \| () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	336	\| o 3:ca1b80f7960a added c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	337	\| \| () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	338	\| o 2:b1661037fa25 added b
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	339	\|/ () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	340	o 1:c7586e2a9264 added a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	341	\| () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	342	o 0:8fa14d15e168 added hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	343	() draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	344
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	345	$ hg evolve --content-divergent
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	346	merge:[9] added d
537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	347	with: [11] added d
3841 82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	348	base: [4] added d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	349	rebasing "other" content-divergent changeset 33e4442acf98 on ca1b80f7960a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	350	updating to "local" side of the conflict: e49523854bc8
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	351	merging "other" divergent changeset 'a663d1567f0b'
3841 82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	352	merging d
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	353	warning: conflicts while merging d! (edit, then use 'hg resolve --mark')
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	354	0 files updated, 0 files merged, 0 files removed, 1 files unresolved
3852 629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	355	fix conflicts and see `hg help evolve.interrupted`
629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3846 diff changeset	356	[1]
3841 82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	357
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	358	$ hg evolve --abort
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	359	evolve aborted
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	360	working directory is now at 33e4442acf98
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	361
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	362	$ hg glog
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	363	@ 11:33e4442acf98 added d
3841 82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	364	\| () draft
3936 537fd9a86c06 test-compat: merge mercurial-4.4 into mercurial-4.3 Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3930 diff changeset	365	\| o 9:e49523854bc8 added d
3841 82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	366	\| \| () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	367	\| o 3:ca1b80f7960a added c
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	368	\| \| () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	369	\| o 2:b1661037fa25 added b
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	370	\|/ () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	371	o 1:c7586e2a9264 added a
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	372	\| () draft
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	373	o 0:8fa14d15e168 added hgignore
82b79a8dafd9 tests: add test about aborting content-divergence when multiple parents Pulkit Goyal <7895pulkit@gmail.com> parents: 3839 diff changeset	374	() draft

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Fri, 03 Aug 2018 00:22:50 +0200
branch	mercurial-4.3
changeset 3936	537fd9a86c06
parent 3930	d00f0c369bc7
child 4082	185770c10a4e
permissions	-rw-r--r--