evolve: tests/test-evolve-continue.t@515d425c0a05 (annotated)

3489 ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	1	Testing the continue functionality of `hg evolve`
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	2
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	3	$ cat >> $HGRCPATH <<EOF
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	4	> [ui]
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	5	> interactive = True
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	6	> [alias]
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	7	> glog = log -GT "{rev}:{node\|short} {desc}\n ({bookmarks}) {phase}"
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	8	> [extensions]
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	9	> rebase =
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	10	> EOF
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	11	$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	12
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	13	Setting up the repo
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	14
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	15	$ hg init repo
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	16	$ cd repo
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	17	$ echo ".*\.orig" > .hgignore
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	18	$ hg add .hgignore
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	19	$ hg ci -m "added hgignore"
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	20	$ for ch in a b c d; do echo foo>$ch; hg add $ch; hg ci -qm "added "$ch; done
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	21
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	22	$ hg glog
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	23	@ 4:c41c793e0ef1 added d
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	24	\| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	25	o 3:ca1b80f7960a added c
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	26	\| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	27	o 2:b1661037fa25 added b
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	28	\| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	29	o 1:c7586e2a9264 added a
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	30	\| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	31	o 0:8fa14d15e168 added hgignore
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	32	() draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	33
4577 bcd52ce0916d evolve: don't update after instability resolution by default (BC) Anton Shestakov <av6@dwimlabs.net> parents: 4576 diff changeset	34	Simple case of evolve --continue
3489 ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	35
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	36	$ hg up ca1b80f7960a
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	37	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	38	$ echo bar > d
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	39	$ hg add d
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	40	$ hg amend
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	41	1 new orphan changesets
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	42	$ hg glog
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	43	@ 5:cb6a2ab625bb added c
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	44	\| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	45	\| * 4:c41c793e0ef1 added d
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	46	\| \| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	47	\| x 3:ca1b80f7960a added c
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	48	\|/ () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	49	o 2:b1661037fa25 added b
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	50	\| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	51	o 1:c7586e2a9264 added a
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	52	\| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	53	o 0:8fa14d15e168 added hgignore
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	54	() draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	55
4577 bcd52ce0916d evolve: don't update after instability resolution by default (BC) Anton Shestakov <av6@dwimlabs.net> parents: 4576 diff changeset	56	$ hg evolve --all
3489 ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	57	move:[4] added d
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	58	atop:[5] added c
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	59	merging d
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	60	warning: conflicts while merging d! (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	61	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	62	(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	63	[1]
3489 ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	64
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	65	$ echo foo > d
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	66	$ hg resolve -m
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	67	(no more unresolved files)
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	68	continue: hg evolve --continue
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	69
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	70	$ hg evolve --continue
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	71	evolving 4:c41c793e0ef1 "added d"
4505 cc2bbe2701a3 evolve: store --update flag state in evolvestate file Anton Shestakov <av6@dwimlabs.net> parents: 4501 diff changeset	72	working directory is now at cb6a2ab625bb
3489 ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	73
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	74	$ hg glog
4505 cc2bbe2701a3 evolve: store --update flag state in evolvestate file Anton Shestakov <av6@dwimlabs.net> parents: 4501 diff changeset	75	o 6:2a4e03d422e2 added d
3489 ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	76	\| () draft
4505 cc2bbe2701a3 evolve: store --update flag state in evolvestate file Anton Shestakov <av6@dwimlabs.net> parents: 4501 diff changeset	77	@ 5:cb6a2ab625bb added c
3489 ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	78	\| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	79	o 2:b1661037fa25 added b
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	80	\| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	81	o 1:c7586e2a9264 added a
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	82	\| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	83	o 0:8fa14d15e168 added hgignore
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	84	() draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	85
4505 cc2bbe2701a3 evolve: store --update flag state in evolvestate file Anton Shestakov <av6@dwimlabs.net> parents: 4501 diff changeset	86	$ hg up
cc2bbe2701a3 evolve: store --update flag state in evolvestate file Anton Shestakov <av6@dwimlabs.net> parents: 4501 diff changeset	87	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cc2bbe2701a3 evolve: store --update flag state in evolvestate file Anton Shestakov <av6@dwimlabs.net> parents: 4501 diff changeset	88
3489 ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	89	Case when conflicts resolution lead to empty wdir in evolve --continue
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	90
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	91	$ echo foo > e
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	92	$ hg ci -Aqm "added e"
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	93	$ hg prev
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	94	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	95	[6] added d
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	96	$ echo bar > e
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	97	$ hg add e
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	98	$ hg amend
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	99	1 new orphan changesets
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	100
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	101	$ hg glog
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	102	@ 8:00a5c774cc37 added d
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	103	\| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	104	\| * 7:ad0a59d83efe added e
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	105	\| \| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	106	\| x 6:2a4e03d422e2 added d
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	107	\|/ () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	108	o 5:cb6a2ab625bb added c
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	109	\| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	110	o 2:b1661037fa25 added b
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	111	\| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	112	o 1:c7586e2a9264 added a
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	113	\| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	114	o 0:8fa14d15e168 added hgignore
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	115	() draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	116
4576 96ce1030d2fb tests: add --update to hg evolve to reduce test changes for the next patch Anton Shestakov <av6@dwimlabs.net> parents: 4505 diff changeset	117	$ hg evolve --update
3489 ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	118	move:[7] added e
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	119	atop:[8] added d
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	120	merging e
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	121	warning: conflicts while merging e! (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	122	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	123	(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	124	[1]
3489 ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	125
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	126	$ echo bar > e
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	127	$ hg resolve -m
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	128	(no more unresolved files)
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	129	continue: hg evolve --continue
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	130	$ hg diff
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	131
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	132	$ hg evolve --continue
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	133	evolving 7:ad0a59d83efe "added e"
3636 92a2d3217de9 evolve: show a message when evolution leads to no changes to commit Pulkit Goyal <7895pulkit@gmail.com> parents: 3503 diff changeset	134	evolution of 7:ad0a59d83efe created no changes to commit
4376 0fbf895ce160 evolve: make "startnode" consistently be a node, not a context Martin von Zweigbergk <martinvonz@google.com> parents: 4122 diff changeset	135	working directory is now at 00a5c774cc37
3489 ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	136
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	137	$ hg glog
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	138	@ 8:00a5c774cc37 added d
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	139	\| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	140	o 5:cb6a2ab625bb added c
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	141	\| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	142	o 2:b1661037fa25 added b
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	143	\| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	144	o 1:c7586e2a9264 added a
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	145	\| () draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	146	o 0:8fa14d15e168 added hgignore
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	147	() draft
ee72cdc2387b tests: add tests for `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	148
3491 92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	149	Case when there are a lot of revision to continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	150
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	151	$ hg up c7586e2a9264
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	152	0 files updated, 0 files merged, 4 files removed, 0 files unresolved
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	153	$ echo bar > b
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	154	$ hg add b
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	155	$ hg amend
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	156	3 new orphan changesets
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	157
4576 96ce1030d2fb tests: add --update to hg evolve to reduce test changes for the next patch Anton Shestakov <av6@dwimlabs.net> parents: 4505 diff changeset	158	$ hg evolve --all --update
3491 92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	159	move:[2] added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	160	atop:[9] added a
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	161	merging b
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	162	warning: conflicts while merging b! (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	163	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	164	(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	165	[1]
3491 92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	166
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	167	$ echo foo > b
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	168	$ hg resolve -m
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	169	(no more unresolved files)
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	170	continue: hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	171	$ hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	172	evolving 2:b1661037fa25 "added b"
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	173	move:[5] added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	174	atop:[10] added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	175	move:[8] added d
3494 14cd04ff968e evolve: show the updated working directory after `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: 3493 diff changeset	176	working directory is now at 6642d2c9176e
3491 92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	177
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	178	$ hg glog
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	179	@ 12:6642d2c9176e added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	180	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	181	o 11:95665a2de664 added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	182	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	183	o 10:87f748868183 added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	184	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	185	o 9:53b632d203d8 added a
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	186	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	187	o 0:8fa14d15e168 added hgignore
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	188	() draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	189
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	190	Conlicts -> resolve -> continue -> conflicts -> resolve -> continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	191	Test multiple conflicts in one evolve
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	192
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	193	$ for ch in f g h; do echo foo > $ch; hg add $ch; hg ci -m "added "$ch; done;
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	194
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	195	$ hg glog
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	196	@ 15:09becba8f97d added h
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	197	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	198	o 14:5aa7b2bbd944 added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	199	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	200	o 13:be88f889b6dc added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	201	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	202	o 12:6642d2c9176e added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	203	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	204	o 11:95665a2de664 added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	205	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	206	o 10:87f748868183 added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	207	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	208	o 9:53b632d203d8 added a
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	209	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	210	o 0:8fa14d15e168 added hgignore
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	211	() draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	212
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	213	$ hg up 95665a2de664
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	214	1 files updated, 0 files merged, 4 files removed, 0 files unresolved
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	215
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	216	$ echo bar > f
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	217	$ echo bar > h
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	218	$ hg add f h
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	219	$ hg amend
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	220	4 new orphan changesets
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	221
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	222	$ hg glog
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	223	@ 16:645135c5caa4 added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	224	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	225	\| * 15:09becba8f97d added h
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	226	\| \| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	227	\| * 14:5aa7b2bbd944 added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	228	\| \| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	229	\| * 13:be88f889b6dc added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	230	\| \| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	231	\| * 12:6642d2c9176e added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	232	\| \| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	233	\| x 11:95665a2de664 added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	234	\|/ () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	235	o 10:87f748868183 added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	236	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	237	o 9:53b632d203d8 added a
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	238	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	239	o 0:8fa14d15e168 added hgignore
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	240	() draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	241
4576 96ce1030d2fb tests: add --update to hg evolve to reduce test changes for the next patch Anton Shestakov <av6@dwimlabs.net> parents: 4505 diff changeset	242	$ hg evolve --all --update
3491 92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	243	move:[12] added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	244	atop:[16] added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	245	move:[13] added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	246	merging f
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	247	warning: conflicts while merging f! (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	248	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	249	(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	250	[1]
3491 92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	251
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	252	$ echo foo > f
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	253	$ hg resolve -m
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	254	(no more unresolved files)
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	255	continue: hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	256	$ hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	257	evolving 13:be88f889b6dc "added f"
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	258	move:[14] added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	259	atop:[18] added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	260	move:[15] added h
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	261	merging h
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	262	warning: conflicts while merging h! (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	263	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	264	(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	265	[1]
3491 92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	266
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	267	$ echo foo > h
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	268	$ hg resolve -m
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	269	(no more unresolved files)
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	270	continue: hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	271	$ hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	272	evolving 15:09becba8f97d "added h"
3494 14cd04ff968e evolve: show the updated working directory after `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: 3493 diff changeset	273	working directory is now at 3ba9d3d1b089
3491 92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	274
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	275	Make sure, confirmopt is respected while continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	276
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	277	$ hg glog
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	278	@ 20:3ba9d3d1b089 added h
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	279	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	280	o 19:981e615b14ca added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	281	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	282	o 18:5794f1a3cbb2 added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	283	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	284	o 17:e47537da02b3 added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	285	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	286	o 16:645135c5caa4 added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	287	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	288	o 10:87f748868183 added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	289	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	290	o 9:53b632d203d8 added a
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	291	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	292	o 0:8fa14d15e168 added hgignore
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	293	() draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	294
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	295	$ hg up 5794f1a3cbb2
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	296	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	297	$ echo bar > g
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	298	$ hg add g
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	299	$ hg amend
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	300	2 new orphan changesets
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	301
4576 96ce1030d2fb tests: add --update to hg evolve to reduce test changes for the next patch Anton Shestakov <av6@dwimlabs.net> parents: 4505 diff changeset	302	$ hg evolve --all --update --confirm << EOF
3491 92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	303	> y
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	304	> EOF
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	305	move:[19] added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	306	atop:[21] added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	307	perform evolve? [Ny] y
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	308	merging g
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	309	warning: conflicts while merging g! (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	310	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	311	(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	312	[1]
3491 92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	313
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	314	$ echo foo > g
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	315	$ hg resolve -m
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	316	(no more unresolved files)
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	317	continue: hg evolve --continue
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	318
4576 96ce1030d2fb tests: add --update to hg evolve to reduce test changes for the next patch Anton Shestakov <av6@dwimlabs.net> parents: 4505 diff changeset	319	$ hg evolve --continue << EOF
3493 4544067b831b evolve: make `hg evolve --continue` respect `--confirm` Pulkit Goyal <7895pulkit@gmail.com> parents: 3492 diff changeset	320	> y
4544067b831b evolve: make `hg evolve --continue` respect `--confirm` Pulkit Goyal <7895pulkit@gmail.com> parents: 3492 diff changeset	321	> EOF
3491 92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	322	evolving 19:981e615b14ca "added g"
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	323	move:[20] added h
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	324	atop:[22] added g
3493 4544067b831b evolve: make `hg evolve --continue` respect `--confirm` Pulkit Goyal <7895pulkit@gmail.com> parents: 3492 diff changeset	325	perform evolve? [Ny] y
3494 14cd04ff968e evolve: show the updated working directory after `hg evolve --continue` Pulkit Goyal <7895pulkit@gmail.com> parents: 3493 diff changeset	326	working directory is now at af6bd002a48d
3491 92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	327
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	328	$ hg glog
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	329	@ 23:af6bd002a48d added h
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	330	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	331	o 22:d2c94a8f44bd added g
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	332	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	333	o 21:9849fa96c885 added f
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	334	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	335	o 17:e47537da02b3 added d
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	336	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	337	o 16:645135c5caa4 added c
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	338	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	339	o 10:87f748868183 added b
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	340	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	341	o 9:53b632d203d8 added a
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	342	\| () draft
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	343	o 0:8fa14d15e168 added hgignore
92df1aac8c7f tests: add more tests to test-evolve-continue.t Pulkit Goyal <7895pulkit@gmail.com> parents: 3490 diff changeset	344	() draft
3502 8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	345
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	346	Testing `evolve --continue` after `hg next --evolve`
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	347
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	348	$ hg up .^^
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	349	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	350	$ echo foobar > g
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	351	$ hg amend
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	352	2 new orphan changesets
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	353
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	354	$ hg next --evolve
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	355	move:[22] added g
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	356	atop:[24] added f
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	357	merging g
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	358	warning: conflicts while merging g! (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	359	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	360	(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	361	[1]
3502 8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	362	$ echo foo > g
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	363	$ hg resolve -m
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	364	(no more unresolved files)
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	365	continue: hg evolve --continue
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	366	$ hg evolve --continue
8cf1020bd4f9 tests: add test showing `evolve --continue` after `next --evolve` is broken Pulkit Goyal <7895pulkit@gmail.com> parents: 3494 diff changeset	367	evolving 22:d2c94a8f44bd "added g"
4425 43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	368
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	369	Testing that interrupted evolve don't get confused about copies (issue5930):
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	370	----------------------------------------------------------------------------
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	371
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	372	$ cd ..
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	373	$ hg init issue5930
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	374	$ cd issue5930
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	375	$ echo a > a
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	376	$ hg ci -Am "added a"
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	377	adding a
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	378	$ hg cp a b
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	379	$ hg ci -m "rename a to b"
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	380
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	381	$ hg up 0 -q
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	382	$ echo c > c
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	383	$ hg ci -Am "added c"
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	384	adding c
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	385	created new head
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	386
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	387	$ echo d > c
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	388	$ echo d > d
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	389	$ hg ci -Am "added d, modified c"
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	390	adding d
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	391	$ hg up .^
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	392	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	393
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	394	$ hg log -G -T "{rev} {desc}\n"
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	395	o 3 added d, modified c
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	396	\|
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	397	@ 2 added c
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	398	\|
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	399	\| o 1 rename a to b
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	400	\|/
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	401	o 0 added a
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	402
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	403	$ hg rebase -r . -d 1
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	404	rebasing 2:29edef26570b "added c"
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	405	1 new orphan changesets
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	406	$ echo conflict > c
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	407	$ hg amend
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	408
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	409	$ hg log -G -T "{rev} {desc}\n"
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	410	@ 5 added c
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	411	\|
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	412	\| * 3 added d, modified c
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	413	\| \|
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	414	\| x 2 added c
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	415	\| \|
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	416	o \| 1 rename a to b
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	417	\|/
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	418	o 0 added a
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	419
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	420
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	421	$ hg evolve
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	422	move:[3] added d, modified c
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	423	atop:[5] added c
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	424	merging c
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	425	warning: conflicts while merging c! (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	426	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	427	(see 'hg help evolve.interrupted')
4425 43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	428	[1]
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	429
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	430	Status mentions file 'b' (copied from 'a') here, even though it wasn't
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	431	affected by the evolved changeset (nor was 'a')
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	432
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	433	$ hg st -C
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	434	M c
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	435	A d
43c24cf6d24b evolve: add tests which shows evolve can get confused about copies (issue5930) Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	436	? c.orig
5010 effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	437
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	438	$ cd ..
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	439	$ hg init transitive-renames
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	440	$ cd transitive-renames
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	441	$ echo 1 > a
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	442	$ echo 1 > b
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	443	$ hg ci -Aqm initial
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	444	$ echo 2 > a
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	445	$ hg mv b c
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	446	$ hg ci -m 'rename b to c'
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	447	$ echo 3 > a
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	448	$ hg mv c d
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	449	$ hg ci -m 'rename c to d'
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	450	$ hg prev -q
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	451	$ echo 2b > a
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	452	$ hg amend -q
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	453	1 new orphan changesets
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	454	$ hg ev -q
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	455	warning: conflicts while merging a! (edit, then use 'hg resolve --mark')
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	456	unresolved merge conflicts
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	457	(see 'hg help evolve.interrupted')
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	458	[1]
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	459	$ hg st -C
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	460	M a
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	461	A d
5011 04104042c6ad evolve: delete redundant and incorrect code for updating dirstate Martin von Zweigbergk <martinvonz@google.com> parents: 5010 diff changeset	462	c
5010 effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	463	R c
effce0a1f5bd tests: demonstrate how evolve loses transitive copies when interrupted Martin von Zweigbergk <martinvonz@google.com> parents: 4676 diff changeset	464	? a.orig

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Tue, 10 Mar 2020 11:07:06 +0100
changeset 5180	515d425c0a05
parent 5011	04104042c6ad
permissions	-rw-r--r--