evolve: tests/test-evolve-issue5832.t@03c3206f44f3 (annotated)

3655 19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	1	Test for issue 5832 present at https://bz.mercurial-scm.org/show_bug.cgi?id=5832
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	2	================================================================================
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	3
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	4	Setup
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	5	=====
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	6
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	7	$ cat >> $HGRCPATH <<EOF
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	8	> [phases]
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	9	> publish = False
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	10	> [alias]
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	11	> glog = log -GT "{rev}:{node\|short} {desc}\n ({bookmarks}) {phase}"
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	12	> [extensions]
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	13	> EOF
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	14	$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	15
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	16	$ hg init issue5832
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	17	$ cd issue5832
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	18
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	19	$ echo base > base
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	20	$ hg ci -Aqm "added base"
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	21
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	22	$ echo a > a
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	23	$ hg ci -Aqm "added a"
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	24
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	25	$ echo b > b
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	26	$ hg ci -Aqm "added b"
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	27
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	28	$ hg up .^^
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	29	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	30	$ echo c > c
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	31	$ echo d > d
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	32	$ hg ci -Aqm "added c and d"
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	33
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	34	$ hg merge
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	35	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	36	(branch merge, don't forget to commit)
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	37	$ hg ci -m "merge commit"
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	38
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	39	$ hg glog
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	40	@ 4:b9b387427a53 merge commit
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	41	\|\ () draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	42	\| o 3:9402371b436e added c and d
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	43	\| \| () draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	44	o \| 2:a1da0651488c added b
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	45	\| \| () draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	46	o \| 1:1b24879c5c3c added a
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	47	\|/ () draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	48	o 0:bde1d2b6b5e5 added base
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	49	() draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	50
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	51	$ hg up 1b24879c5c3c
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	52	0 files updated, 0 files merged, 3 files removed, 0 files unresolved
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	53	$ echo foo > a
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	54	$ hg amend
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	55	2 new orphan changesets
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	56
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	57	$ hg up bde1d2b6b5e5
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	58	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	59	$ echo c > c
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	60	$ hg ci -Aqm "added c"
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	61	$ hg up .^
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	62	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	63	$ echo d > d
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	64	$ hg ci -Aqm "added d"
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	65	$ hg glog
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	66	@ 7:5841d7cf9893 added d
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	67	\| () draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	68	\| o 6:62fb70414f99 added c
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	69	\|/ () draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	70	\| o 5:7014ec2829cd added a
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	71	\|/ () draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	72	\| * 4:b9b387427a53 merge commit
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	73	\| \|\ () draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	74	+---o 3:9402371b436e added c and d
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	75	\| \| () draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	76	\| * 2:a1da0651488c added b
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	77	\| \| () draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	78	\| x 1:1b24879c5c3c added a
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	79	\|/ () draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	80	o 0:bde1d2b6b5e5 added base
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	81	() draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	82
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	83	$ hg prune -r 9402371b436e --succ 62fb70414f99 --succ 5841d7cf9893 --split
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	84	1 changesets pruned
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	85
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	86	$ hg glog
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	87	@ 7:5841d7cf9893 added d
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	88	\| () draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	89	\| o 6:62fb70414f99 added c
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	90	\|/ () draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	91	\| o 5:7014ec2829cd added a
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	92	\|/ () draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	93	\| * 4:b9b387427a53 merge commit
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	94	\| \|\ () draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	95	+---x 3:9402371b436e added c and d
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	96	\| \| () draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	97	\| * 2:a1da0651488c added b
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	98	\| \| () draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	99	\| x 1:1b24879c5c3c added a
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	100	\|/ () draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	101	o 0:bde1d2b6b5e5 added base
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	102	() draft
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	103
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	104	Checking what evolve is trying to do
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	105
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	106	$ hg evolve --dry-run --any --all
3656 62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	107	move:[2] added b
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	108	atop:[5] added a
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	109	hg rebase -r a1da0651488c -d 7014ec2829cd
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	110	could not solve instability, ambiguous destination: parent split across two branches
3655 19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	111
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	112	Resolving instability using `hg evolve`
19e3771f4bcc tests: add a test demonstarting issue5832 traceback Pulkit Goyal <7895pulkit@gmail.com> parents: diff changeset	113
3656 62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	114	$ hg evolve --any --all --config ui.interactive=True <<EOF
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	115	> 0
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	116	> EOF
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	117	move:[2] added b
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	118	atop:[5] added a
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	119	move:[4] merge commit
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	120	ancestor '7235ef625ea3' split over multiple topological branches.
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	121	choose an evolve destination:
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	122	0: [62fb70414f99] added c
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	123	1: [5841d7cf9893] added d
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	124	q: quit the prompt
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	125	enter the index of the revision you want to select: 0
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	126	move:[9] merge commit
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	127	atop:[6] added c
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	128	working directory is now at 28a0775ac832
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	129
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	130	$ hg glog
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	131	@ 10:28a0775ac832 merge commit
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	132	\|\ () draft
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	133	\| o 8:2baf8bae7ea4 added b
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	134	\| \| () draft
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	135	\| \| o 7:5841d7cf9893 added d
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	136	\| \| \| () draft
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	137	o---+ 6:62fb70414f99 added c
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	138	/ / () draft
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	139	o / 5:7014ec2829cd added a
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	140	\|/ () draft
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	141	o 0:bde1d2b6b5e5 added base
62e4149435d8 utility: convert node from MultipleSuccessorsError to rev numbers (issue5832) Pulkit Goyal <7895pulkit@gmail.com> parents: 3655 diff changeset	142	() draft
3657 b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	143
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	144	$ cd ..
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	145
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	146	Test for issue5833 present at https://bz.mercurial-scm.org/show_bug.cgi?id=5833
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	147	===============================================================================
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	148
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	149	$ hg init issue5833
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	150	$ cd issue5833
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	151	$ echo base > base
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	152	$ hg ci -Aqm "added base"
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	153
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	154	$ echo a > a
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	155	$ hg ci -Aqm "added a"
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	156
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	157	$ echo b > b
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	158	$ hg ci -Aqm "added b"
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	159
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	160	$ hg up .^^
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	161	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	162	$ echo c > c
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	163	$ echo d > d
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	164	$ hg ci -Aqm "added c and d"
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	165
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	166	$ hg merge
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	167	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	168	(branch merge, don't forget to commit)
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	169	$ hg ci -m "merge commit"
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	170
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	171	$ hg glog
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	172	@ 4:b9b387427a53 merge commit
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	173	\|\ () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	174	\| o 3:9402371b436e added c and d
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	175	\| \| () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	176	o \| 2:a1da0651488c added b
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	177	\| \| () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	178	o \| 1:1b24879c5c3c added a
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	179	\|/ () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	180	o 0:bde1d2b6b5e5 added base
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	181	() draft
3898 93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	182	$ hg log -r 'p1(.)'
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	183	changeset: 3:9402371b436e
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	184	parent: 0:bde1d2b6b5e5
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	185	user: test
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	186	date: Thu Jan 01 00:00:00 1970 +0000
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	187	summary: added c and d
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	188
3657 b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	189	$ hg up bde1d2b6b5e5
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	190	0 files updated, 0 files merged, 4 files removed, 0 files unresolved
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	191	$ echo l > l
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	192	$ hg ci -Aqm "added l"
4053 ecbf61d90807 pick: replace `hg grab` invocation in test with `hg pick` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4049 diff changeset	193	$ hg pick -r 1b24879c5c3c
4049 25981fae92f9 pick: update command output to mention pick instead of grab Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3901 diff changeset	194	picking 1:1b24879c5c3c "added a"
3657 b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	195	2 new orphan changesets
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	196
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	197	$ hg up bde1d2b6b5e5
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	198	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	199	$ echo c > c
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	200	$ hg ci -Aqm "added c"
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	201	$ hg up .^
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	202	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	203	$ echo d > d
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	204	$ hg ci -Aqm "added d"
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	205
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	206	$ hg glog
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	207	@ 8:5841d7cf9893 added d
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	208	\| () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	209	\| o 7:62fb70414f99 added c
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	210	\|/ () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	211	\| o 6:5568b87b1491 added a
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	212	\| \| () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	213	\| o 5:0a6281e212fe added l
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	214	\|/ () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	215	\| * 4:b9b387427a53 merge commit
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	216	\| \|\ () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	217	+---o 3:9402371b436e added c and d
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	218	\| \| () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	219	\| * 2:a1da0651488c added b
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	220	\| \| () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	221	\| x 1:1b24879c5c3c added a
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	222	\|/ () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	223	o 0:bde1d2b6b5e5 added base
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	224	() draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	225
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	226	$ hg prune -r 9402371b436e --succ 5841d7cf9893 --succ 62fb70414f99 --split
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	227	1 changesets pruned
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	228
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	229	$ hg glog
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	230	@ 8:5841d7cf9893 added d
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	231	\| () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	232	\| o 7:62fb70414f99 added c
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	233	\|/ () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	234	\| o 6:5568b87b1491 added a
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	235	\| \| () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	236	\| o 5:0a6281e212fe added l
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	237	\|/ () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	238	\| * 4:b9b387427a53 merge commit
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	239	\| \|\ () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	240	+---x 3:9402371b436e added c and d
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	241	\| \| () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	242	\| * 2:a1da0651488c added b
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	243	\| \| () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	244	\| x 1:1b24879c5c3c added a
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	245	\|/ () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	246	o 0:bde1d2b6b5e5 added base
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	247	() draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	248
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	249	$ hg evolve --any --all --dry-run
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	250	move:[2] added b
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	251	atop:[6] added a
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	252	hg rebase -r a1da0651488c -d 5568b87b1491
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	253	could not solve instability, ambiguous destination: parent split across two branches
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	254
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	255	$ hg evolve --any --all --config ui.interactive=True <<EOF
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	256	> 1
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	257	> EOF
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	258	move:[2] added b
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	259	atop:[6] added a
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	260	move:[4] merge commit
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	261	ancestor 'cdf2ea1b9312' split over multiple topological branches.
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	262	choose an evolve destination:
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	263	0: [62fb70414f99] added c
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	264	1: [5841d7cf9893] added d
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	265	q: quit the prompt
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	266	enter the index of the revision you want to select: 1
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	267	move:[10] merge commit
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	268	atop:[8] added d
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	269	working directory is now at 460e6e72b7f9
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	270
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	271	$ hg glog
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	272	@ 11:460e6e72b7f9 merge commit
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	273	\|\ () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	274	\| o 9:da76bb7cd904 added b
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	275	\| \| () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	276	o \| 8:5841d7cf9893 added d
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	277	\| \| () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	278	+---o 7:62fb70414f99 added c
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	279	\| \| () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	280	\| o 6:5568b87b1491 added a
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	281	\| \| () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	282	\| o 5:0a6281e212fe added l
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	283	\|/ () draft
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	284	o 0:bde1d2b6b5e5 added base
b36e38e3a176 tests: add test demonstarting issue5833 is fixed Pulkit Goyal <7895pulkit@gmail.com> parents: 3656 diff changeset	285	() draft
3898 93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	286
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	287	Test for issue5946 present at https://bz.mercurial-scm.org/show_bug.cgi?id=5946
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	288	===============================================================================
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	289	issue with computing dependency with split and merge
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	290
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	291	$ hg init issue5946
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	292	$ cd issue5946
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	293	$ echo base > base
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	294	$ hg ci -Aqm "added base"
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	295
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	296	$ echo a > a
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	297	$ hg ci -Aqm "added a"
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	298
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	299	$ echo b > b
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	300	$ hg ci -Aqm "added b"
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	301
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	302	$ hg up .^^
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	303	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	304	$ echo c > c
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	305	$ echo d > d
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	306	$ hg ci -Aqm "added c and d"
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	307	The next line is the only difference from issue5833 above, i.e. the order of
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	308	the parents is reversed
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	309	$ hg co 2
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	310	2 files updated, 0 files merged, 2 files removed, 0 files unresolved
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	311
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	312	$ hg merge
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	313	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	314	(branch merge, don't forget to commit)
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	315	$ hg ci -m "merge commit"
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	316
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	317	$ hg glog
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	318	@ 4:b9b387427a53 merge commit
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	319	\|\ () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	320	\| o 3:9402371b436e added c and d
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	321	\| \| () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	322	o \| 2:a1da0651488c added b
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	323	\| \| () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	324	o \| 1:1b24879c5c3c added a
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	325	\|/ () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	326	o 0:bde1d2b6b5e5 added base
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	327	() draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	328	$ hg log -r 'p1(.)'
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	329	changeset: 2:a1da0651488c
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	330	user: test
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	331	date: Thu Jan 01 00:00:00 1970 +0000
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	332	summary: added b
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	333
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	334	$ hg up bde1d2b6b5e5
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	335	0 files updated, 0 files merged, 4 files removed, 0 files unresolved
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	336	$ echo l > l
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	337	$ hg ci -Aqm "added l"
4053 ecbf61d90807 pick: replace `hg grab` invocation in test with `hg pick` Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4049 diff changeset	338	$ hg pick -r 1b24879c5c3c
4049 25981fae92f9 pick: update command output to mention pick instead of grab Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3901 diff changeset	339	picking 1:1b24879c5c3c "added a"
3898 93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	340	2 new orphan changesets
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	341
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	342	$ hg up bde1d2b6b5e5
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	343	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	344	$ echo c > c
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	345	$ hg ci -Aqm "added c"
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	346	$ hg up .^
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	347	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	348	$ echo d > d
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	349	$ hg ci -Aqm "added d"
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	350
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	351	$ hg glog
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	352	@ 8:5841d7cf9893 added d
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	353	\| () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	354	\| o 7:62fb70414f99 added c
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	355	\|/ () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	356	\| o 6:5568b87b1491 added a
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	357	\| \| () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	358	\| o 5:0a6281e212fe added l
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	359	\|/ () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	360	\| * 4:b9b387427a53 merge commit
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	361	\| \|\ () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	362	+---o 3:9402371b436e added c and d
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	363	\| \| () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	364	\| * 2:a1da0651488c added b
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	365	\| \| () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	366	\| x 1:1b24879c5c3c added a
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	367	\|/ () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	368	o 0:bde1d2b6b5e5 added base
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	369	() draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	370
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	371	$ hg prune -r 9402371b436e --succ 5841d7cf9893 --succ 62fb70414f99 --split
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	372	1 changesets pruned
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	373
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	374	$ hg glog
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	375	@ 8:5841d7cf9893 added d
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	376	\| () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	377	\| o 7:62fb70414f99 added c
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	378	\|/ () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	379	\| o 6:5568b87b1491 added a
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	380	\| \| () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	381	\| o 5:0a6281e212fe added l
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	382	\|/ () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	383	\| * 4:b9b387427a53 merge commit
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	384	\| \|\ () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	385	+---x 3:9402371b436e added c and d
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	386	\| \| () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	387	\| * 2:a1da0651488c added b
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	388	\| \| () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	389	\| x 1:1b24879c5c3c added a
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	390	\|/ () draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	391	o 0:bde1d2b6b5e5 added base
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	392	() draft
93d9cde93b82 tests: add test for issue5946 Martin von Zweigbergk <martinvonz@google.com> parents: 3657 diff changeset	393
3901 f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	394	$ hg evolve --any --all --dry-run
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	395	move:[2] added b
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	396	atop:[6] added a
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	397	hg rebase -r a1da0651488c -d 5568b87b1491
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	398	could not solve instability, ambiguous destination: parent split across two branches
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	399
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	400	$ hg evolve --any --all --config ui.interactive=True <<EOF
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	401	> 1
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	402	> EOF
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	403	move:[2] added b
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	404	atop:[6] added a
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	405	ancestor 'b9b387427a53' split over multiple topological branches.
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	406	choose an evolve destination:
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	407	0: [62fb70414f99] added c
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	408	1: [5841d7cf9893] added d
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	409	q: quit the prompt
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	410	enter the index of the revision you want to select: 1
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	411	move:[4] merge commit
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	412	atop:[8] added d
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	413	move:[10] merge commit
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	414	atop:[9] added b
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	415	working directory is now at 578c938ebd2e
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	416
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	417	$ hg glog
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	418	@ 11:578c938ebd2e merge commit
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	419	\|\ () draft
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	420	\| o 9:da76bb7cd904 added b
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	421	\| \| () draft
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	422	o \| 8:5841d7cf9893 added d
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	423	\| \| () draft
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	424	+---o 7:62fb70414f99 added c
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	425	\| \| () draft
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	426	\| o 6:5568b87b1491 added a
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	427	\| \| () draft
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	428	\| o 5:0a6281e212fe added l
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	429	\|/ () draft
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	430	o 0:bde1d2b6b5e5 added base
f2b8429db565 builddependencies: don't remove found deps when divergence found (issue5946) Martin von Zweigbergk <martinvonz@google.com> parents: 3898 diff changeset	431	() draft

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Fri, 12 Oct 2018 16:25:06 +0200
branch	stable
changeset 4175	03c3206f44f3
parent 4122	4eb3877540f1
child 4173	e268f7fd7839
child 4393	159a4a6ded0b
permissions	-rw-r--r--