evolve: tests/test-topic-dest.t@170b99a9c0b4 (annotated)

2045 db617700d318 tests: move "test setup" script into a 'testlib' directory Pierre-Yves David <pierre-yves.david@ens-lyon.org> parents: 1953 diff changeset	1	$ . "$TESTDIR/testlib/topic_setup.sh"
1870 8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	2
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	3	$ hg init jungle
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	4	$ cd jungle
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	5	$ cat <<EOF >> .hg/hgrc
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	6	> [extensions]
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	7	> rebase=
1911 442a7cb8404e histedit: restrict default edited set to current topic when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 1900 diff changeset	8	> histedit=
1870 8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	9	> [phases]
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	10	> publish=false
1900 27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	11	> EOF
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	12	$ cat <<EOF >> $HGRCPATH
1870 8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	13	> [ui]
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	14	> logtemplate = '{rev} ({topics}) {desc}\n'
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	15	> EOF
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	16
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	17	$ for x in alpha beta gamma delta ; do
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	18	> echo file $x >> $x
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	19	> hg add $x
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	20	> hg ci -m "c_$x"
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	21	> done
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	22
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	23	Test NGTip feature
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	24	==================
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	25
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	26	Simple linear case
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	27
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	28	$ echo babar >> jungle
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	29	$ hg add jungle
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	30	$ hg ci -t elephant -m babar
2988 62201935e1a7 topics/ui: detect and signal when an empty changeset becomes non-empty Aurélien Campéas parents: 2985 diff changeset	31	active topic 'elephant' grew its first changeset
1870 8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	32
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	33	$ hg log -G
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	34	@ 4 (elephant) babar
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	35	\|
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	36	o 3 () c_delta
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	37	\|
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	38	o 2 () c_gamma
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	39	\|
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	40	o 1 () c_beta
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	41	\|
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	42	o 0 () c_alpha
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	43
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	44	$ hg log -r 'ngtip(.)'
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	45	3 () c_delta
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1875 diff changeset	46	$ hg log -r 'default'
d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1875 diff changeset	47	3 () c_delta
1870 8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	48
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	49
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	50	multiple heads with topic
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	51
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	52	$ hg up "desc('c_beta')"
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	53	0 files updated, 0 files merged, 3 files removed, 0 files unresolved
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	54	$ echo zephir >> jungle
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	55	$ hg add jungle
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	56	$ hg ci -t monkey -m zephir
2988 62201935e1a7 topics/ui: detect and signal when an empty changeset becomes non-empty Aurélien Campéas parents: 2985 diff changeset	57	active topic 'monkey' grew its first changeset
1870 8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	58	$ hg log -G
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	59	@ 5 (monkey) zephir
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	60	\|
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	61	\| o 4 (elephant) babar
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	62	\| \|
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	63	\| o 3 () c_delta
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	64	\| \|
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	65	\| o 2 () c_gamma
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	66	\|/
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	67	o 1 () c_beta
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	68	\|
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	69	o 0 () c_alpha
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	70
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	71	$ hg log -r 'ngtip(.)'
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	72	3 () c_delta
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1875 diff changeset	73	$ hg log -r 'default'
d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1875 diff changeset	74	3 () c_delta
1870 8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	75
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	76	one of the head is a valid tip
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	77
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	78	$ hg up "desc('c_delta')"
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	79	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	80	$ echo epsilon >> epsilon
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	81	$ hg add epsilon
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	82	$ hg ci -m "c_epsilon"
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	83	$ hg log -G
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	84	@ 6 () c_epsilon
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	85	\|
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	86	\| o 5 (monkey) zephir
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	87	\| \|
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	88	+---o 4 (elephant) babar
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	89	\| \|
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	90	o \| 3 () c_delta
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	91	\| \|
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	92	o \| 2 () c_gamma
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	93	\|/
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	94	o 1 () c_beta
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	95	\|
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	96	o 0 () c_alpha
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	97
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	98	$ hg log -r 'ngtip(.)'
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	99	6 () c_epsilon
1885 d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1875 diff changeset	100	$ hg log -r 'default'
d49f75eab6a3 topic: take topic in account for all branch head computation Pierre-Yves David <pierre-yves.david@fb.com> parents: 1875 diff changeset	101	6 () c_epsilon
1870 8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	102
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	103	rebase destination
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	104	==================
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	105
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	106	rebase on branch ngtip
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	107
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	108	$ hg up elephant
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	109	switching to topic elephant
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	110	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	111	$ hg rebase
3016 d12c82fd1143 tests: update test output with commit 4f969b9e0cf5 in core Pulkit Goyal <7895pulkit@gmail.com> parents: 2988 diff changeset	112	rebasing 4:cb7ae72f4a80 "babar" (elephant)
2679 5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2120 diff changeset	113	switching to topic elephant
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	114	$ hg log -G
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	115	@ 7 (elephant) babar
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	116	\|
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	117	o 6 () c_epsilon
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	118	\|
1875 9eba8561870b test-topic-dest: test fixes I should have put in the previous change Augie Fackler <raf@durin42.com> parents: 1871 diff changeset	119	\| o 5 (monkey) zephir
9eba8561870b test-topic-dest: test fixes I should have put in the previous change Augie Fackler <raf@durin42.com> parents: 1871 diff changeset	120	\| \|
9eba8561870b test-topic-dest: test fixes I should have put in the previous change Augie Fackler <raf@durin42.com> parents: 1871 diff changeset	121	o \| 3 () c_delta
9eba8561870b test-topic-dest: test fixes I should have put in the previous change Augie Fackler <raf@durin42.com> parents: 1871 diff changeset	122	\| \|
9eba8561870b test-topic-dest: test fixes I should have put in the previous change Augie Fackler <raf@durin42.com> parents: 1871 diff changeset	123	o \| 2 () c_gamma
9eba8561870b test-topic-dest: test fixes I should have put in the previous change Augie Fackler <raf@durin42.com> parents: 1871 diff changeset	124	\|/
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	125	o 1 () c_beta
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	126	\|
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	127	o 0 () c_alpha
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	128
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	129	$ hg up monkey
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	130	switching to topic monkey
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	131	1 files updated, 0 files merged, 3 files removed, 0 files unresolved
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	132	$ hg rebase
3016 d12c82fd1143 tests: update test output with commit 4f969b9e0cf5 in core Pulkit Goyal <7895pulkit@gmail.com> parents: 2988 diff changeset	133	rebasing 5:d832ddc604ec "zephir" (monkey)
2679 5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2120 diff changeset	134	switching to topic monkey
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	135	$ hg log -G
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	136	@ 8 (monkey) zephir
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	137	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	138	\| o 7 (elephant) babar
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	139	\|/
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	140	o 6 () c_epsilon
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	141	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	142	o 3 () c_delta
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	143	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	144	o 2 () c_gamma
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	145	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	146	o 1 () c_beta
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	147	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	148	o 0 () c_alpha
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	149
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	150
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	151	Rebase on other topic heads if any
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	152
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	153	$ hg up 'desc(c_delta)'
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	154	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	155	$ echo "General Huc" >> monkeyville
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	156	$ hg add monkeyville
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	157	$ hg ci -t monkey -m Huc
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	158	$ hg log -G
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	159	@ 9 (monkey) Huc
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	160	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	161	\| o 8 (monkey) zephir
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	162	\| \|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	163	\| \| o 7 (elephant) babar
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	164	\| \|/
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	165	\| o 6 () c_epsilon
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	166	\|/
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	167	o 3 () c_delta
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	168	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	169	o 2 () c_gamma
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	170	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	171	o 1 () c_beta
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	172	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	173	o 0 () c_alpha
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	174
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	175	$ hg rebase
3016 d12c82fd1143 tests: update test output with commit 4f969b9e0cf5 in core Pulkit Goyal <7895pulkit@gmail.com> parents: 2988 diff changeset	176	rebasing 9:d79a104e2902 "Huc" (tip monkey)
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	177	$ hg log -G
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	178	@ 10 (monkey) Huc
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	179	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	180	o 8 (monkey) zephir
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	181	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	182	\| o 7 (elephant) babar
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	183	\|/
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	184	o 6 () c_epsilon
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	185	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	186	o 3 () c_delta
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	187	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	188	o 2 () c_gamma
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	189	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	190	o 1 () c_beta
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	191	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	192	o 0 () c_alpha
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	193
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	194
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	195	merge destination
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	196	=================
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	197
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	198	$ hg up 'ngtip(default)'
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	199	0 files updated, 0 files merged, 2 files removed, 0 files unresolved
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	200	$ hg up default
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	201	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	202	$ echo zeta >> zeta
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	203	$ hg add zeta
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	204	$ hg ci -m "c_zeta"
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	205	$ hg log -G
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	206	@ 11 () c_zeta
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	207	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	208	\| o 10 (monkey) Huc
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	209	\| \|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	210	\| o 8 (monkey) zephir
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	211	\|/
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	212	\| o 7 (elephant) babar
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	213	\|/
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	214	o 6 () c_epsilon
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	215	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	216	o 3 () c_delta
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	217	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	218	o 2 () c_gamma
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	219	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	220	o 1 () c_beta
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	221	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	222	o 0 () c_alpha
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	223
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	224	$ hg up elephant
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	225	switching to topic elephant
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	226	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	227	$ hg rebase -d 'desc(c_zeta)' # make sure tip is elsewhere
3016 d12c82fd1143 tests: update test output with commit 4f969b9e0cf5 in core Pulkit Goyal <7895pulkit@gmail.com> parents: 2988 diff changeset	228	rebasing 7:8d0b77140b05 "babar" (elephant)
2679 5156a67f66a6 topics: update current topic to the topic of newly rebased commit (issue5551) Pulkit Goyal <7895pulkit@gmail.com> parents: 2120 diff changeset	229	switching to topic elephant
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	230	$ hg up monkey
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	231	switching to topic monkey
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	232	2 files updated, 0 files merged, 1 files removed, 0 files unresolved
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	233	$ hg merge
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	234	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	235	(branch merge, don't forget to commit)
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	236	$ hg topic
3060 f43a310c4338 topics: show changesetcount, troubledcount and headscount by default Pulkit Goyal <7895pulkit@gmail.com> parents: 3016 diff changeset	237	elephant (1 changesets)
f43a310c4338 topics: show changesetcount, troubledcount and headscount by default Pulkit Goyal <7895pulkit@gmail.com> parents: 3016 diff changeset	238	* monkey (2 changesets)
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	239	$ hg ci -m 'merge with default'
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	240	$ hg topic
3060 f43a310c4338 topics: show changesetcount, troubledcount and headscount by default Pulkit Goyal <7895pulkit@gmail.com> parents: 3016 diff changeset	241	elephant (1 changesets)
f43a310c4338 topics: show changesetcount, troubledcount and headscount by default Pulkit Goyal <7895pulkit@gmail.com> parents: 3016 diff changeset	242	* monkey (3 changesets)
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	243	$ hg log -G
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	244	@ 13 (monkey) merge with default
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	245	\|\
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	246	\| \| o 12 (elephant) babar
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	247	\| \|/
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	248	\| o 11 () c_zeta
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	249	\| \|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	250	o \| 10 (monkey) Huc
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	251	\| \|
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	252	o \| 8 (monkey) zephir
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	253	\|/
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	254	o 6 () c_epsilon
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	255	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	256	o 3 () c_delta
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	257	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	258	o 2 () c_gamma
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	259	\|
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	260	o 1 () c_beta
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	261	\|
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	262	o 0 () c_alpha
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	263
1892 b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	264
1900 27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	265
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	266	Check pull --rebase
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	267	-------------------
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	268
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	269	(we broke it a some point)
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	270
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	271	$ cd ..
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	272	$ hg clone jungle other --rev '2'
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	273	adding changesets
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	274	adding manifests
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	275	adding file changes
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	276	added 3 changesets with 3 changes to 3 files
3075 8feb2cae7eae test: adapt to output change from eb586ed5d8ce Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3060 diff changeset	277	new changesets 13ec05df14e1:6482f08916a5
1900 27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	278	updating to branch default
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	279	3 files updated, 0 files merged, 0 files removed, 0 files unresolved
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	280	$ cd other
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	281	$ echo other > other
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	282	$ hg add other
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	283	$ hg ci -m 'c_other'
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	284	$ hg pull -r default --rebase
2120 e38156312410 tests: add glob for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 2045 diff changeset	285	pulling from $TESTTMP/jungle (glob)
1900 27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	286	searching for changes
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	287	adding changesets
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	288	adding manifests
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	289	adding file changes
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	290	added 3 changesets with 3 changes to 3 files (+1 heads)
3075 8feb2cae7eae test: adapt to output change from eb586ed5d8ce Pierre-Yves David <pierre-yves.david@octobus.net> parents: 3060 diff changeset	291	new changesets 6f5edd7450bb:c9c03b99196b
1900 27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	292	rebasing 3:dbc48dd9e743 "c_other"
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	293	$ hg log -G
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	294	@ 7 () c_other
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	295	\|
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	296	o 6 () c_zeta
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	297	\|
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	298	o 5 () c_epsilon
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	299	\|
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	300	o 4 () c_delta
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	301	\|
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	302	o 2 () c_gamma
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	303	\|
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	304	o 1 () c_beta
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	305	\|
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	306	o 0 () c_alpha
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	307
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	308	$ cd ../jungle
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	309
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	310
1892 b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	311	Default destination for update
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	312	===============================
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	313
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	314	initial setup
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	315
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	316	$ hg up elephant
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	317	switching to topic elephant
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	318	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	319	$ echo arthur >> jungle
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	320	$ hg ci -m arthur
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	321	$ echo pompadour >> jungle
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	322	$ hg ci -m pompadour
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	323	$ hg up 'roots(all())'
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	324	0 files updated, 0 files merged, 6 files removed, 0 files unresolved
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	325	$ hg log -G
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	326	o 15 (elephant) pompadour
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	327	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	328	o 14 (elephant) arthur
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	329	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	330	\| o 13 (monkey) merge with default
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	331	\| \|\
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	332	o---+ 12 (elephant) babar
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	333	/ /
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	334	\| o 11 () c_zeta
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	335	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	336	o \| 10 (monkey) Huc
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	337	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	338	o \| 8 (monkey) zephir
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	339	\|/
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	340	o 6 () c_epsilon
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	341	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	342	o 3 () c_delta
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	343	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	344	o 2 () c_gamma
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	345	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	346	o 1 () c_beta
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	347	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	348	@ 0 () c_alpha
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	349
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	350
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	351	testing default destination on a branch
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	352
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	353	$ hg up
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	354	5 files updated, 0 files merged, 0 files removed, 0 files unresolved
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	355	$ hg log -G
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	356	o 15 (elephant) pompadour
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	357	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	358	o 14 (elephant) arthur
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	359	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	360	\| o 13 (monkey) merge with default
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	361	\| \|\
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	362	o---+ 12 (elephant) babar
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	363	/ /
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	364	\| @ 11 () c_zeta
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	365	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	366	o \| 10 (monkey) Huc
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	367	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	368	o \| 8 (monkey) zephir
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	369	\|/
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	370	o 6 () c_epsilon
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	371	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	372	o 3 () c_delta
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	373	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	374	o 2 () c_gamma
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	375	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	376	o 1 () c_beta
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	377	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	378	o 0 () c_alpha
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	379
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	380
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	381	extra setup for topic
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	382	(making sure tip is not the topic)
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	383
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	384	$ hg up 'desc(c_zeta)'
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	385	0 files updated, 0 files merged, 0 files removed, 0 files unresolved
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	386	$ echo 'eta' >> 'eta'
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	387	$ hg add 'eta'
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	388	$ hg commit -m 'c_eta'
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	389	$ hg log -G
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	390	@ 16 () c_eta
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	391	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	392	\| o 15 (elephant) pompadour
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	393	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	394	\| o 14 (elephant) arthur
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	395	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	396	+---o 13 (monkey) merge with default
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	397	\| \| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	398	\| o \| 12 (elephant) babar
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	399	\|/ /
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	400	o \| 11 () c_zeta
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	401	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	402	\| o 10 (monkey) Huc
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	403	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	404	\| o 8 (monkey) zephir
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	405	\|/
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	406	o 6 () c_epsilon
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	407	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	408	o 3 () c_delta
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	409	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	410	o 2 () c_gamma
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	411	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	412	o 1 () c_beta
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	413	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	414	o 0 () c_alpha
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	415
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	416
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	417	Testing default destination for topic
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	418
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	419	$ hg up 'roots(topic(elephant))'
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	420	switching to topic elephant
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	421	1 files updated, 0 files merged, 1 files removed, 0 files unresolved
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	422	$ hg up
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	423	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	424	$ hg log -G
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	425	o 16 () c_eta
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	426	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	427	\| @ 15 (elephant) pompadour
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	428	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	429	\| o 14 (elephant) arthur
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	430	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	431	+---o 13 (monkey) merge with default
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	432	\| \| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	433	\| o \| 12 (elephant) babar
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	434	\|/ /
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	435	o \| 11 () c_zeta
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	436	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	437	\| o 10 (monkey) Huc
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	438	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	439	\| o 8 (monkey) zephir
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	440	\|/
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	441	o 6 () c_epsilon
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	442	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	443	o 3 () c_delta
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	444	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	445	o 2 () c_gamma
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	446	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	447	o 1 () c_beta
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	448	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	449	o 0 () c_alpha
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	450
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	451
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	452	Testing default destination for topic
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	453
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	454	$ hg up 'p1(roots(topic(elephant)))'
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	455	0 files updated, 0 files merged, 1 files removed, 0 files unresolved
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	456	$ hg topic elephant
2985 f63c97c01f92 topics/ui: signal when the topics command creates a new (empty) topic Aurélien Campéas parents: 2679 diff changeset	457	marked working directory as topic: elephant
1892 b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	458	$ hg up
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	459	1 files updated, 0 files merged, 0 files removed, 0 files unresolved
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	460	$ hg log -G
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	461	o 16 () c_eta
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	462	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	463	\| @ 15 (elephant) pompadour
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	464	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	465	\| o 14 (elephant) arthur
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	466	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	467	+---o 13 (monkey) merge with default
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	468	\| \| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	469	\| o \| 12 (elephant) babar
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	470	\|/ /
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	471	o \| 11 () c_zeta
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	472	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	473	\| o 10 (monkey) Huc
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	474	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	475	\| o 8 (monkey) zephir
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	476	\|/
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	477	o 6 () c_epsilon
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	478	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	479	o 3 () c_delta
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	480	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	481	o 2 () c_gamma
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	482	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	483	o 1 () c_beta
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	484	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	485	o 0 () c_alpha
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	486
1911 442a7cb8404e histedit: restrict default edited set to current topic when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 1900 diff changeset	487
442a7cb8404e histedit: restrict default edited set to current topic when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 1900 diff changeset	488	Default destination for histedit
442a7cb8404e histedit: restrict default edited set to current topic when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 1900 diff changeset	489	================================
442a7cb8404e histedit: restrict default edited set to current topic when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 1900 diff changeset	490
1915 cb651dbd0965 spelling: histedit timeless@gmail.com parents: 1911 diff changeset	491	By default histedit should edit with the current topic only
1911 442a7cb8404e histedit: restrict default edited set to current topic when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 1900 diff changeset	492	(even when based on other draft
442a7cb8404e histedit: restrict default edited set to current topic when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 1900 diff changeset	493
442a7cb8404e histedit: restrict default edited set to current topic when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 1900 diff changeset	494	$ hg phase 'desc(c_zeta)'
442a7cb8404e histedit: restrict default edited set to current topic when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 1900 diff changeset	495	11: draft
442a7cb8404e histedit: restrict default edited set to current topic when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 1900 diff changeset	496	$ HGEDITOR=cat hg histedit \| grep pick
442a7cb8404e histedit: restrict default edited set to current topic when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 1900 diff changeset	497	pick e44744d9ad73 12 babar
442a7cb8404e histedit: restrict default edited set to current topic when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 1900 diff changeset	498	pick 38eea8439aee 14 arthur
442a7cb8404e histedit: restrict default edited set to current topic when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 1900 diff changeset	499	pick 411315c48bdc 15 pompadour
442a7cb8404e histedit: restrict default edited set to current topic when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 1900 diff changeset	500	# p, pick = use commit

author	Pulkit Goyal <7895pulkit@gmail.com>
	Fri, 23 Mar 2018 19:36:08 +0530
changeset 3628	170b99a9c0b4
parent 3075	8feb2cae7eae
child 3100	ccfcacc5ee7c
child 3769	1bc4b0807c37
permissions	-rw-r--r--