evolve: tests/test-evolve-topic.t@33c617626fd9 (annotated)

1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	1
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	2	Check we can find the topic extensions
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	3
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	4	$ cat >> $HGRCPATH <<EOF
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	5	> [defaults]
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	6	> amend=-d "0 0"
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	7	> fold=-d "0 0"
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	8	> [phases]
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	9	> publish = False
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	10	> [ui]
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	11	> logtemplate = {rev} - \{{get(namespaces, "topics")}} {node\|short} {desc} ({phase})\n
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	12	> [diff]
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	13	> git = 1
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	14	> unified = 0
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	15	> [extensions]
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	16	> rebase =
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	17	> EOF
1806 9f42f819267b evolve: move the extensions to 'hgext3rd' Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1723 diff changeset	18	$ echo "evolve=$(echo $(dirname $TESTDIR))/hgext3rd/evolve/" >> $HGRCPATH
2020 143c8e4dc22d topic: merge the topic extension in the evolve repository Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1806 diff changeset	19	$ echo "topic=$(echo $(dirname $TESTDIR))/hgext3rd/topic/" >> $HGRCPATH
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	20
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	21	$ mkcommit() {
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	22	> echo "$1" > "$1"
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	23	> hg add "$1"
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	24	> hg ci -m "add $1"
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	25	> }
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	26
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	27	Create a simple setup
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	28
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	29	$ hg init repoa
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	30	$ cd repoa
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	31	$ mkcommit aaa
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	32	$ mkcommit bbb
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	33	$ hg topic foo
2985 f63c97c01f92 topics/ui: signal when the topics command creates a new (empty) topic Aurélien Campéas parents: 2929 diff changeset	34	marked working directory as topic: foo
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	35	$ mkcommit ccc
2988 62201935e1a7 topics/ui: detect and signal when an empty changeset becomes non-empty Aurélien Campéas parents: 2985 diff changeset	36	active topic 'foo' grew its first changeset
3769 1bc4b0807c37 topic: display a hint pointing at help when a topic becomes non-empty Denis Laxalde <denis.laxalde@logilab.fr> parents: 3580 diff changeset	37	(see 'hg help topics' for more information)
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	38	$ mkcommit ddd
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	39	$ mkcommit eee
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	40	$ mkcommit fff
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	41	$ hg topic bar
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	42	$ mkcommit ggg
2988 62201935e1a7 topics/ui: detect and signal when an empty changeset becomes non-empty Aurélien Campéas parents: 2985 diff changeset	43	active topic 'bar' grew its first changeset
3769 1bc4b0807c37 topic: display a hint pointing at help when a topic becomes non-empty Denis Laxalde <denis.laxalde@logilab.fr> parents: 3580 diff changeset	44	(see 'hg help topics' for more information)
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	45	$ mkcommit hhh
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	46	$ mkcommit iii
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	47	$ mkcommit jjj
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	48
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	49	$ hg log -G
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	50	@ 9 - {bar} 1d964213b023 add jjj (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	51	\|
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	52	o 8 - {bar} fcab990f3261 add iii (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	53	\|
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	54	o 7 - {bar} b0c2554835ac add hhh (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	55	\|
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	56	o 6 - {bar} c748293f1c1a add ggg (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	57	\|
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	58	o 5 - {foo} 6a6b7365c751 add fff (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	59	\|
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	60	o 4 - {foo} 3969ab847d9c add eee (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	61	\|
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	62	o 3 - {foo} 4e3a154f38c7 add ddd (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	63	\|
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	64	o 2 - {foo} cced9bac76e3 add ccc (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	65	\|
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	66	o 1 - {} a4dbed0837ea add bbb (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	67	\|
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	68	o 0 - {} 199cc73e9a0b add aaa (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	69
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	70
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	71	Test that evolve --all evolve the current topic
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	72	-----------------------------------------------
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	73
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	74	make a mess
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	75
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	76	$ hg up foo
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	77	switching to topic foo
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	78	0 files updated, 0 files merged, 4 files removed, 0 files unresolved
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	79	$ hg topic -l
1723 2672f36d668e test: adapt to topic changes Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1694 diff changeset	80	### topic: foo (?)
2672f36d668e test: adapt to topic changes Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1694 diff changeset	81	### branch: default (?)
2997 a61634f52742 topic: try to clarify the "branch" part in stack Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2988 diff changeset	82	### target: default (branch)
4067 fb4801478d5d stack: display 's#' instead of 't#' and 'b#' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3769 diff changeset	83	s4@ add fff (current)
fb4801478d5d stack: display 's#' instead of 't#' and 'b#' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3769 diff changeset	84	s3: add eee
fb4801478d5d stack: display 's#' instead of 't#' and 'b#' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3769 diff changeset	85	s2: add ddd
fb4801478d5d stack: display 's#' instead of 't#' and 'b#' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3769 diff changeset	86	s1: add ccc
fb4801478d5d stack: display 's#' instead of 't#' and 'b#' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3769 diff changeset	87	s0^ add bbb (base)
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	88	$ hg up 'desc(ddd)'
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	89	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	90	$ echo ddd >> ddd
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	91	$ hg amend
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	92	6 new orphan changesets
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	93	$ hg up 'desc(fff)'
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	94	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	95	$ echo fff >> fff
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	96	$ hg amend
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	97
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	98	$ hg log -G
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	99	@ 11 - {foo} e104f49bab28 add fff (draft)
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	100	\|
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	101	\| o 10 - {foo} d9cacd156ffc add ddd (draft)
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	102	\| \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3414 diff changeset	103	\| \| * 9 - {bar} 1d964213b023 add jjj (draft)
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	104	\| \| \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3414 diff changeset	105	\| \| * 8 - {bar} fcab990f3261 add iii (draft)
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	106	\| \| \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3414 diff changeset	107	\| \| * 7 - {bar} b0c2554835ac add hhh (draft)
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	108	\| \| \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3414 diff changeset	109	\| \| * 6 - {bar} c748293f1c1a add ggg (draft)
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	110	\| \| \|
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	111	+---x 5 - {foo} 6a6b7365c751 add fff (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	112	\| \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3414 diff changeset	113	* \| 4 - {foo} 3969ab847d9c add eee (draft)
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	114	\| \|
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	115	x \| 3 - {foo} 4e3a154f38c7 add ddd (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	116	\|/
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	117	o 2 - {foo} cced9bac76e3 add ccc (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	118	\|
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	119	o 1 - {} a4dbed0837ea add bbb (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	120	\|
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	121	o 0 - {} 199cc73e9a0b add aaa (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	122
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	123
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	124	Run evolve --all
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	125
4155 cc3a0b13ae57 evolve: use stack alias s# in `hg evolve` msgs Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	126	$ hg stack
cc3a0b13ae57 evolve: use stack alias s# in `hg evolve` msgs Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	127	### topic: foo
cc3a0b13ae57 evolve: use stack alias s# in `hg evolve` msgs Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	128	### target: default (branch)
4436 ef155f624670 stack: make @ (current) more important than $ (some sort of unstable) Anton Shestakov <av6@dwimlabs.net> parents: 4432 diff changeset	129	s4@ add fff (current orphan)
4432 5da1d162ad50 stack: rename unstable -> orphan Anton Shestakov <av6@dwimlabs.net> parents: 4268 diff changeset	130	s3$ add eee (orphan)
4155 cc3a0b13ae57 evolve: use stack alias s# in `hg evolve` msgs Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	131	s2: add ddd
cc3a0b13ae57 evolve: use stack alias s# in `hg evolve` msgs Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	132	s1: add ccc
cc3a0b13ae57 evolve: use stack alias s# in `hg evolve` msgs Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	133	s0^ add bbb (base)
cc3a0b13ae57 evolve: use stack alias s# in `hg evolve` msgs Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	134
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	135	$ hg evolve --all
4155 cc3a0b13ae57 evolve: use stack alias s# in `hg evolve` msgs Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	136	move:[s3] add eee
cc3a0b13ae57 evolve: use stack alias s# in `hg evolve` msgs Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	137	atop:[s2] add ddd
cc3a0b13ae57 evolve: use stack alias s# in `hg evolve` msgs Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4122 diff changeset	138	move:[s4] add fff
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	139	working directory is now at 070c5573d8f9
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	140	$ hg log -G
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	141	@ 13 - {foo} 070c5573d8f9 add fff (draft)
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	142	\|
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	143	o 12 - {foo} 42b49017ff90 add eee (draft)
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	144	\|
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	145	o 10 - {foo} d9cacd156ffc add ddd (draft)
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	146	\|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3414 diff changeset	147	\| * 9 - {bar} 1d964213b023 add jjj (draft)
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	148	\| \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3414 diff changeset	149	\| * 8 - {bar} fcab990f3261 add iii (draft)
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	150	\| \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3414 diff changeset	151	\| * 7 - {bar} b0c2554835ac add hhh (draft)
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	152	\| \|
3417 d3a17c67f85c branching: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3414 diff changeset	153	\| * 6 - {bar} c748293f1c1a add ggg (draft)
1626 0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	154	\| \|
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	155	\| x 5 - {foo} 6a6b7365c751 add fff (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	156	\| \|
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	157	\| x 4 - {foo} 3969ab847d9c add eee (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	158	\| \|
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	159	\| x 3 - {foo} 4e3a154f38c7 add ddd (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	160	\|/
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	161	o 2 - {foo} cced9bac76e3 add ccc (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	162	\|
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	163	o 1 - {} a4dbed0837ea add bbb (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	164	\|
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	165	o 0 - {} 199cc73e9a0b add aaa (draft)
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	166
0edb545503fe topic: 'hg evolve --all' pick all trouble within current topic Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	167
1627 a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	168	Test that evolve does not loose topic information
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	169	-------------------------------------------------
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	170
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	171	$ hg evolve --rev 'topic(bar)'
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	172	move:[6] add ggg
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	173	atop:[13] add fff
1627 a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	174	move:[7] add hhh
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	175	move:[8] add iii
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	176	move:[9] add jjj
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	177	working directory is now at 9bf430c106b7
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	178	$ hg log -G
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	179	@ 17 - {bar} 9bf430c106b7 add jjj (draft)
1627 a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	180	\|
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	181	o 16 - {bar} d2dc89c57700 add iii (draft)
1627 a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	182	\|
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	183	o 15 - {bar} 20bc4d02aa62 add hhh (draft)
1627 a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	184	\|
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	185	o 14 - {bar} 16d6f664b17c add ggg (draft)
1627 a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	186	\|
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	187	o 13 - {foo} 070c5573d8f9 add fff (draft)
1627 a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	188	\|
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	189	o 12 - {foo} 42b49017ff90 add eee (draft)
1627 a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	190	\|
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	191	o 10 - {foo} d9cacd156ffc add ddd (draft)
1627 a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	192	\|
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	193	o 2 - {foo} cced9bac76e3 add ccc (draft)
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	194	\|
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	195	o 1 - {} a4dbed0837ea add bbb (draft)
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	196	\|
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	197	o 0 - {} 199cc73e9a0b add aaa (draft)
a91115687a7e topic: preserve topic during evolve Pierre-Yves David <pierre-yves.david@fb.com> parents: 1626 diff changeset	198
1628 db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	199
db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	200	Tests next and prev behavior
db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	201	============================
db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	202
db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	203	Basic move are restricted to the current topic
db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	204
db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	205	$ hg up foo
db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	206	switching to topic foo
db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	207	0 files updated, 0 files merged, 4 files removed, 0 files unresolved
db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	208	$ hg prev
db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	209	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4161 3c28f8a3a5a5 prev: also use stack shortcut in output when possible Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4160 diff changeset	210	[s3] add eee
1628 db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	211	$ hg next
db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	212	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
4160 44133463372f next: also use stack shortcut in output when possible Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4155 diff changeset	213	[s4] add fff
1628 db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	214	$ hg next
db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	215	no children on topic "foo"
db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	216	do you want --no-topic
db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	217	[1]
db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	218	$ hg next --no-topic
db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	219	switching to topic bar
db19b1dc5c45 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1627 diff changeset	220	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	221	[14] add ggg
1629 548195454683 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1628 diff changeset	222	$ hg prev
2745 b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2739 diff changeset	223	preserving the current topic 'bar'
b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2739 diff changeset	224	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4161 3c28f8a3a5a5 prev: also use stack shortcut in output when possible Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4160 diff changeset	225	[s4] add fff
2745 b38112b43a27 prev: allow to update to 't0' from 't1' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2739 diff changeset	226	$ hg prev
1629 548195454683 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1628 diff changeset	227	no parent in topic "bar"
548195454683 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1628 diff changeset	228	(do you want --no-topic)
2739 7d86594cb829 prev: extract the code computing the destination Pierre-Yves David <pierre-yves.david@octobus.net> parents: 2712 diff changeset	229	[1]
1629 548195454683 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1628 diff changeset	230	$ hg prev --no-topic
548195454683 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1628 diff changeset	231	switching to topic foo
548195454683 topic: restrict 'hg prev' to current topic unless --no-topic is passed Pierre-Yves David <pierre-yves.david@fb.com> parents: 1628 diff changeset	232	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
3013 945a0989e41b packaging: merge stable back into default Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3000 diff changeset	233	[12] add eee
3361 1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	234
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	235	Testing when instability is involved
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	236
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	237	$ hg log -G
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	238	o 17 - {bar} 9bf430c106b7 add jjj (draft)
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	239	\|
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	240	o 16 - {bar} d2dc89c57700 add iii (draft)
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	241	\|
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	242	o 15 - {bar} 20bc4d02aa62 add hhh (draft)
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	243	\|
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	244	o 14 - {bar} 16d6f664b17c add ggg (draft)
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	245	\|
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	246	o 13 - {foo} 070c5573d8f9 add fff (draft)
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	247	\|
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	248	@ 12 - {foo} 42b49017ff90 add eee (draft)
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	249	\|
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	250	o 10 - {foo} d9cacd156ffc add ddd (draft)
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	251	\|
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	252	o 2 - {foo} cced9bac76e3 add ccc (draft)
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	253	\|
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	254	o 1 - {} a4dbed0837ea add bbb (draft)
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	255	\|
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	256	o 0 - {} 199cc73e9a0b add aaa (draft)
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	257
3406 77284eefbd4d test: use hash in test-evolve-topic.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3375 diff changeset	258	$ hg topic -r 070c5573d8f9 bar
3431 2e703ed1c713 evolve: update output for wider reporting of troubled changesets Martin von Zweigbergk <martinvonz@google.com> parents: 3417 diff changeset	259	4 new orphan changesets
4268 d5a2cc19903f topics: improve the message around topic changing Pulkit Goyal <pulkit@yandex-team.ru> parents: 4221 diff changeset	260	changed topic on 1 changesets to "bar"
3406 77284eefbd4d test: use hash in test-evolve-topic.t Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3375 diff changeset	261	$ hg up 16d6f664b17c
3361 1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	262	switching to topic bar
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	263	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	264
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	265	$ hg stack
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	266	### topic: bar
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	267	### target: default (branch)
4432 5da1d162ad50 stack: rename unstable -> orphan Anton Shestakov <av6@dwimlabs.net> parents: 4268 diff changeset	268	s5$ add jjj (orphan)
5da1d162ad50 stack: rename unstable -> orphan Anton Shestakov <av6@dwimlabs.net> parents: 4268 diff changeset	269	s4$ add iii (orphan)
5da1d162ad50 stack: rename unstable -> orphan Anton Shestakov <av6@dwimlabs.net> parents: 4268 diff changeset	270	s3$ add hhh (orphan)
4436 ef155f624670 stack: make @ (current) more important than $ (some sort of unstable) Anton Shestakov <av6@dwimlabs.net> parents: 4432 diff changeset	271	s2@ add ggg (current orphan)
4067 fb4801478d5d stack: display 's#' instead of 't#' and 'b#' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3769 diff changeset	272	s1: add fff
fb4801478d5d stack: display 's#' instead of 't#' and 'b#' Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3769 diff changeset	273	s0^ add eee (base)
3361 1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	274
1439021d22f9 tests: add a test showing wrong behaviour doing `hg prev` on orphan cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3013 diff changeset	275	$ hg prev
3362 92b414710d2e prev: jump to parent's successor if parent is obsolete and topic is involved Pulkit Goyal <7895pulkit@gmail.com> parents: 3361 diff changeset	276	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4161 3c28f8a3a5a5 prev: also use stack shortcut in output when possible Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4160 diff changeset	277	[s1] add fff
3531 b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	278
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	279	Testing issue 5708 when we are on obsolete changeset and there is active topic
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	280	------------------------------------------------------------------------------
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	281
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	282	$ hg log --graph
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	283	@ 18 - {bar} 793eb6370b2d add fff (draft)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	284	\|
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	285	\| * 17 - {bar} 9bf430c106b7 add jjj (draft)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	286	\| \|
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	287	\| * 16 - {bar} d2dc89c57700 add iii (draft)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	288	\| \|
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	289	\| * 15 - {bar} 20bc4d02aa62 add hhh (draft)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	290	\| \|
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	291	\| * 14 - {bar} 16d6f664b17c add ggg (draft)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	292	\| \|
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	293	\| x 13 - {foo} 070c5573d8f9 add fff (draft)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	294	\|/
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	295	o 12 - {foo} 42b49017ff90 add eee (draft)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	296	\|
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	297	o 10 - {foo} d9cacd156ffc add ddd (draft)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	298	\|
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	299	o 2 - {foo} cced9bac76e3 add ccc (draft)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	300	\|
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	301	o 1 - {} a4dbed0837ea add bbb (draft)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	302	\|
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	303	o 0 - {} 199cc73e9a0b add aaa (draft)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	304
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	305
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	306	$ hg topic
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	307	* bar (5 changesets, 4 troubled)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	308	foo (3 changesets)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	309
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	310	When the current topic, obsoleted changesets topic and successor topic are same
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	311
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	312	$ hg up 20bc4d02aa62
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	313	2 files updated, 0 files merged, 0 files removed, 0 files unresolved
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	314	$ echo foobar >> hhh
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	315	$ hg amend
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	316	$ hg up 20bc4d02aa62
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	317	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	318	working directory parent is obsolete! (20bc4d02aa62)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	319	(use 'hg evolve' to update to its successor: d834582d9ee3)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	320	$ hg log -Gr 14::
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	321	* 19 - {bar} d834582d9ee3 add hhh (draft)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	322	\|
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	323	\| * 17 - {bar} 9bf430c106b7 add jjj (draft)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	324	\| \|
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	325	\| * 16 - {bar} d2dc89c57700 add iii (draft)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	326	\| \|
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	327	\| @ 15 - {bar} 20bc4d02aa62 add hhh (draft)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	328	\|/
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	329	* 14 - {bar} 16d6f664b17c add ggg (draft)
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	330	\|
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	331	~
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	332
b3d2e0576d4c prev: add a test case which shows traceback when doing prev on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3431 diff changeset	333	$ hg prev
3532 68e99d2c6267 prev: fix the breakage of `hg previous` from obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3531 diff changeset	334	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4161 3c28f8a3a5a5 prev: also use stack shortcut in output when possible Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4160 diff changeset	335	[s2] add ggg
3533 f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	336
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	337	When the current topic and successors topic are same, but obsolete cset has
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	338	different topic
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	339
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	340	$ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase=
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	341	rebasing 16:d2dc89c57700 "add iii" (bar)
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	342	1 new orphan changesets
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	343	rebasing 17:9bf430c106b7 "add jjj" (bar)
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	344	1 new orphan changesets
3580 031d70bcbb42 test: do not use revision number Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3534 diff changeset	345	$ hg log -Gr 42b49017ff90::
3533 f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	346	* 21 - {bar} 7542e76aba2c add jjj (draft)
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	347	\|
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	348	* 20 - {bar} 7858bd7e9906 add iii (draft)
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	349	\|
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	350	* 19 - {bar} d834582d9ee3 add hhh (draft)
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	351	\|
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	352	\| o 18 - {bar} 793eb6370b2d add fff (draft)
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	353	\| \|
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	354	@ \| 14 - {bar} 16d6f664b17c add ggg (draft)
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	355	\| \|
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	356	x \| 13 - {foo} 070c5573d8f9 add fff (draft)
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	357	\|/
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	358	o 12 - {foo} 42b49017ff90 add eee (draft)
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	359	\|
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	360	~
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	361
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	362	$ hg up 070c5573d8f9
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	363	switching to topic foo
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	364	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	365	working directory parent is obsolete! (070c5573d8f9)
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	366	(use 'hg evolve' to update to its successor: 793eb6370b2d)
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	367
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	368	$ hg topic bar
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	369
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	370	$ hg prev
3534 cd4db75413a2 previous: fix behavior on obsolete cset when topic is involved (issue5708) Pulkit Goyal <7895pulkit@gmail.com> parents: 3533 diff changeset	371	no parent in topic "bar"
cd4db75413a2 previous: fix behavior on obsolete cset when topic is involved (issue5708) Pulkit Goyal <7895pulkit@gmail.com> parents: 3533 diff changeset	372	(do you want --no-topic)
3533 f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	373	[1]
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	374
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	375	When current topic and obsolete cset topic are same but successor has different
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	376	one
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	377
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	378	$ hg up 070c5573d8f9
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	379	switching to topic foo
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	380	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
f06c502ce4b7 previous: add test case when it's broken on obsolete cset Pulkit Goyal <7895pulkit@gmail.com> parents: 3532 diff changeset	381	$ hg prev
3534 cd4db75413a2 previous: fix behavior on obsolete cset when topic is involved (issue5708) Pulkit Goyal <7895pulkit@gmail.com> parents: 3533 diff changeset	382	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
4161 3c28f8a3a5a5 prev: also use stack shortcut in output when possible Pierre-Yves David <pierre-yves.david@octobus.net> parents: 4160 diff changeset	383	[s3] add eee
4220 0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	384
4221 db70de7c1698 evolve: use stack template in --continue case also Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4220 diff changeset	385	Check stackaliases(s#) works with --continue case also, while evolving:
db70de7c1698 evolve: use stack template in --continue case also Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4220 diff changeset	386	------------------------------------------------------------------------
4220 0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	387	$ hg up 18
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	388	switching to topic bar
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	389	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	390	$ hg evolve --all
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	391	move:[s2] add ggg
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	392	atop:[s1] add fff
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	393	move:[s3] add hhh
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	394	move:[s4] add iii
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	395	move:[s5] add jjj
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	396	working directory is now at 38a82cbb794a
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	397	$ hg up 18
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	398	0 files updated, 0 files merged, 4 files removed, 0 files unresolved
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	399	$ echo "changes in hhh" > hhh
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	400	$ hg add hhh
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	401	$ hg ci --amend
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	402	4 new orphan changesets
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	403	$ hg log -G
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	404	@ 26 - {bar} 2c295936ac04 add fff (draft)
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	405	\|
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	406	\| * 25 - {bar} 38a82cbb794a add jjj (draft)
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	407	\| \|
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	408	\| * 24 - {bar} 4a44eba0fdb3 add iii (draft)
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	409	\| \|
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	410	\| * 23 - {bar} 7acd9ea5d677 add hhh (draft)
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	411	\| \|
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	412	\| * 22 - {bar} 735c7bd8f133 add ggg (draft)
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	413	\| \|
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	414	\| x 18 - {bar} 793eb6370b2d add fff (draft)
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	415	\|/
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	416	o 12 - {foo} 42b49017ff90 add eee (draft)
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	417	\|
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	418	o 10 - {foo} d9cacd156ffc add ddd (draft)
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	419	\|
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	420	o 2 - {foo} cced9bac76e3 add ccc (draft)
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	421	\|
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	422	o 1 - {} a4dbed0837ea add bbb (draft)
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	423	\|
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	424	o 0 - {} 199cc73e9a0b add aaa (draft)
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	425
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	426	$ hg evolve --all
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	427	move:[s2] add ggg
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	428	atop:[s1] add fff
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	429	move:[s3] add hhh
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	430	merging hhh
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	431	warning: conflicts while merging hhh! (edit, then use 'hg resolve --mark')
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	432	fix conflicts and see `hg help evolve.interrupted`
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	433	[1]
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	434	$ echo "resolved hhh" > hhh
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	435	$ hg resolve --mark hhh
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	436	(no more unresolved files)
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	437	continue: hg evolve --continue
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	438	$ hg evolve --continue
0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	439	evolving 23:7acd9ea5d677 "add hhh"
4221 db70de7c1698 evolve: use stack template in --continue case also Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4220 diff changeset	440	move:[s4] add iii
db70de7c1698 evolve: use stack template in --continue case also Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4220 diff changeset	441	atop:[s3] add hhh
db70de7c1698 evolve: use stack template in --continue case also Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4220 diff changeset	442	move:[s5] add jjj
4220 0e59b03afe0a evolve: add test showing currently stackalias fails in --continue case Sushil khanchi <sushilkhanchi97@gmail.com> parents: 4161 diff changeset	443	working directory is now at 119e4c126fb2

author	Pierre-Yves David <pierre-yves.david@octobus.net>
	Fri, 12 Apr 2019 02:15:24 +0200
branch	stable
changeset 4517	33c617626fd9
parent 4436	ef155f624670
child 4516	f54bb6eaf5e6
child 4576	96ce1030d2fb
permissions	-rw-r--r--