evolve: tests/test-evolve-phase.t@f560d23639e1 (annotated)

3387 b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	1	Testing the handling of phases for `hg evolve` command
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	2
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	3	$ cat >> $HGRCPATH <<EOF
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	4	> [phases]
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	5	> publish = False
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	6	> [alias]
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	7	> glog = log -G --template='{rev} - {node\|short} {desc} ({phase})\n'
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	8	> [extensions]
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	9	> EOF
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	10	$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	11
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	12	Testing when there are no conflicts during evolve
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	13
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	14	$ hg init noconflict
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	15	$ cd noconflict
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	16	$ echo a>a
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	17	$ hg ci -Aqm a
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	18	$ echo b>b
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	19	$ hg ci -Aqm b
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	20	$ echo c>c
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	21	$ hg ci -Aqsm c
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	22	$ hg glog
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	23	@ 2 - 177f92b77385 c (secret)
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	24	\|
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	25	o 1 - d2ae7f538514 b (draft)
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	26	\|
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	27	o 0 - cb9a9f314b8b a (draft)
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	28
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	29
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	30	$ hg prev
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	31	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	32	[1] b
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	33	$ echo b2>b
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	34	$ hg amend
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	35	1 new orphan changesets
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	36	$ hg evolve
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	37	move:[2] c
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	38	atop:[3] b
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	39	$ hg glog
4577 bcd52ce0916d evolve: don't update after instability resolution by default (BC) Anton Shestakov <av6@dwimlabs.net> parents: 3978 diff changeset	40	o 4 - 813dde83a7f3 c (secret)
3387 b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	41	\|
4577 bcd52ce0916d evolve: don't update after instability resolution by default (BC) Anton Shestakov <av6@dwimlabs.net> parents: 3978 diff changeset	42	@ 3 - fd89d0f19529 b (draft)
3387 b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	43	\|
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	44	o 0 - cb9a9f314b8b a (draft)
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	45
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	46	$ cd ..
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	47
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	48	Testing case when there are conflicts (bug 5720)
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	49
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	50	$ hg init conflicts
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	51	$ cd conflicts
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	52	$ echo a > a
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	53	$ hg ci -Am a
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	54	adding a
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	55	$ echo b > a
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	56	$ hg ci -m b
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	57	$ echo c > a
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	58	$ hg ci -sm c
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	59	$ hg glog
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	60	@ 2 - 13833940840c c (secret)
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	61	\|
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	62	o 1 - 1e6c11564562 b (draft)
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	63	\|
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	64	o 0 - cb9a9f314b8b a (draft)
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	65
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	66
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	67	$ hg prev
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	68	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	69	[1] b
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	70	$ echo b2 > a
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	71	$ hg amend
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	72	1 new orphan changesets
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	73
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	74	$ hg glog
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	75	@ 3 - 87495ea7c9ec b (draft)
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	76	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3411 diff changeset	77	\| * 2 - 13833940840c c (secret)
3387 b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	78	\| \|
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	79	\| x 1 - 1e6c11564562 b (draft)
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	80	\|/
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	81	o 0 - cb9a9f314b8b a (draft)
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	82
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	83	$ hg evolve
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	84	move:[2] c
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	85	atop:[3] b
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	86	merging a
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	87	warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
4676 b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them Anton Shestakov <av6@dwimlabs.net> parents: 4577 diff changeset	88	unresolved merge conflicts
b6c819facbe8 evolvecmd: the proper way to deal with conflicts is to resolve them Anton Shestakov <av6@dwimlabs.net> parents: 4577 diff changeset	89	(see 'hg help evolve.interrupted')
3852 629558d09898 evolve: raise error.InterventionRequired instead of Abort when conflicts Pulkit Goyal <7895pulkit@gmail.com> parents: 3843 diff changeset	90	[1]
3387 b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	91
3394 d1486760fb8d tests: add a test demonstrating we still use graft in conflict markers Pulkit Goyal <7895pulkit@gmail.com> parents: 3388 diff changeset	92	$ hg diff
d1486760fb8d tests: add a test demonstrating we still use graft in conflict markers Pulkit Goyal <7895pulkit@gmail.com> parents: 3388 diff changeset	93	diff -r 87495ea7c9ec a
d1486760fb8d tests: add a test demonstrating we still use graft in conflict markers Pulkit Goyal <7895pulkit@gmail.com> parents: 3388 diff changeset	94	--- a/a Thu Jan 01 00:00:00 1970 +0000
d1486760fb8d tests: add a test demonstrating we still use graft in conflict markers Pulkit Goyal <7895pulkit@gmail.com> parents: 3388 diff changeset	95	+++ b/a Thu Jan 01 00:00:00 1970 +0000
d1486760fb8d tests: add a test demonstrating we still use graft in conflict markers Pulkit Goyal <7895pulkit@gmail.com> parents: 3388 diff changeset	96	@@ -1,1 +1,5 @@
3395 02192ac8ef98 evolve: use better words in conflict markers of `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3394 diff changeset	97	+<<<<<<< destination: 87495ea7c9ec - test: b
3394 d1486760fb8d tests: add a test demonstrating we still use graft in conflict markers Pulkit Goyal <7895pulkit@gmail.com> parents: 3388 diff changeset	98	b2
d1486760fb8d tests: add a test demonstrating we still use graft in conflict markers Pulkit Goyal <7895pulkit@gmail.com> parents: 3388 diff changeset	99	+=======
d1486760fb8d tests: add a test demonstrating we still use graft in conflict markers Pulkit Goyal <7895pulkit@gmail.com> parents: 3388 diff changeset	100	+c
3395 02192ac8ef98 evolve: use better words in conflict markers of `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: 3394 diff changeset	101	+>>>>>>> evolving: 13833940840c - test: c
3394 d1486760fb8d tests: add a test demonstrating we still use graft in conflict markers Pulkit Goyal <7895pulkit@gmail.com> parents: 3388 diff changeset	102
3387 b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	103	$ hg glog
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	104	@ 3 - 87495ea7c9ec b (draft)
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	105	\|
3978 fb8e44c70798 evolve: set the second parent if we get conflicts while evolving Pulkit Goyal <pulkit@yandex-team.ru> parents: 3852 diff changeset	106	\| @ 2 - 13833940840c c (secret)
3387 b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	107	\| \|
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	108	\| x 1 - 1e6c11564562 b (draft)
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	109	\|/
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	110	o 0 - cb9a9f314b8b a (draft)
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	111
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	112
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	113	$ echo c2 > a
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	114	$ hg resolve -m
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	115	(no more unresolved files)
3472 05bd493d496d evolve: add evolve info to cmdutil.afterresolvedstates Pulkit Goyal <7895pulkit@gmail.com> parents: 3417 diff changeset	116	continue: hg evolve --continue
3387 b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	117	$ hg evolve -c
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	118	evolving 2:13833940840c "c"
4577 bcd52ce0916d evolve: don't update after instability resolution by default (BC) Anton Shestakov <av6@dwimlabs.net> parents: 3978 diff changeset	119	working directory is now at 87495ea7c9ec
3387 b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	120
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	121	$ hg glog
4577 bcd52ce0916d evolve: don't update after instability resolution by default (BC) Anton Shestakov <av6@dwimlabs.net> parents: 3978 diff changeset	122	o 4 - 3d2080c198e5 c (secret)
3387 b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	123	\|
4577 bcd52ce0916d evolve: don't update after instability resolution by default (BC) Anton Shestakov <av6@dwimlabs.net> parents: 3978 diff changeset	124	@ 3 - 87495ea7c9ec b (draft)
3387 b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	125	\|
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	126	o 0 - cb9a9f314b8b a (draft)
b3be4797d3c6 tests: add a test demonstarting lose of phase in `hg evolve` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	127

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Mon, 06 Apr 2020 07:26:40 +0200
branch	stable
changeset 5273	f560d23639e1
parent 4676	b6c819facbe8
permissions	-rw-r--r--