evolve: tests/test-topic-dest.t@d63f383e43b6 (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
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	31
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	32	$ hg log -G
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	33	@ 4 (elephant) babar
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	34	\|
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	35	o 3 () c_delta
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	36	\|
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	37	o 2 () c_gamma
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	38	\|
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	39	o 1 () c_beta
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	40	\|
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	41	o 0 () c_alpha
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	42
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	43	$ hg log -r 'ngtip(.)'
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	44	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	45	$ 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	46	3 () c_delta
1870 8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	47
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	multiple heads with topic
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	50
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	51	$ hg up "desc('c_beta')"
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	52	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	53	$ echo zephir >> jungle
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	54	$ hg add jungle
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	55	$ hg ci -t monkey -m zephir
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	56	$ hg log -G
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	57	@ 5 (monkey) zephir
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	58	\|
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	59	\| o 4 (elephant) babar
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 3 () c_delta
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 2 () c_gamma
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 1 () c_beta
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 0 () c_alpha
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	$ hg log -r 'ngtip(.)'
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	70	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	71	$ 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	72	3 () c_delta
1870 8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	73
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	74	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	75
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	76	$ hg up "desc('c_delta')"
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	77	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	78	$ echo epsilon >> epsilon
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	79	$ hg add epsilon
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	80	$ hg ci -m "c_epsilon"
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	81	$ hg log -G
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	82	@ 6 () c_epsilon
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	83	\|
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	84	\| o 5 (monkey) zephir
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 4 (elephant) babar
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 \| 3 () c_delta
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 \| 2 () c_gamma
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 1 () c_beta
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 0 () c_alpha
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	$ hg log -r 'ngtip(.)'
8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	97	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	98	$ 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	99	6 () c_epsilon
1870 8dd5200b4086 topic: introduce a 'ngtip' concept Pierre-Yves David <pierre-yves.david@fb.com> parents: diff changeset	100
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	101	rebase destination
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	102	==================
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	103
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	104	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	105
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	106	$ hg up elephant
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	107	switching to topic elephant
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	108	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	109	$ hg rebase
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	110	rebasing 4:cb7ae72f4a80 "babar"
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	111	$ hg log -G
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	112	@ 7 (elephant) babar
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	113	\|
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	114	o 6 () c_epsilon
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	115	\|
1875 9eba8561870b test-topic-dest: test fixes I should have put in the previous change Augie Fackler <raf@durin42.com> parents: 1871 diff changeset	116	\| 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	117	\| \|
9eba8561870b test-topic-dest: test fixes I should have put in the previous change Augie Fackler <raf@durin42.com> parents: 1871 diff changeset	118	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	119	\| \|
9eba8561870b test-topic-dest: test fixes I should have put in the previous change Augie Fackler <raf@durin42.com> parents: 1871 diff changeset	120	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	121	\|/
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	122	o 1 () c_beta
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	123	\|
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	124	o 0 () c_alpha
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	125
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	126	$ hg up monkey
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	127	switching to topic monkey
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	128	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	129	$ hg rebase
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	130	rebasing 5:d832ddc604ec "zephir"
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	131	$ hg log -G
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	132	@ 8 (monkey) zephir
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	133	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	134	\| o 7 (elephant) babar
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	135	\|/
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	136	o 6 () c_epsilon
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 3 () c_delta
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 2 () c_gamma
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 1 () c_beta
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 0 () c_alpha
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
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	147	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	148
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	149	$ hg up 'desc(c_delta)'
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	150	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	151	$ echo "General Huc" >> monkeyville
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	152	$ hg add monkeyville
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	153	$ 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	154	$ hg log -G
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	155	@ 9 (monkey) Huc
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	156	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	157	\| o 8 (monkey) zephir
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	158	\| \|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	159	\| \| o 7 (elephant) babar
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 6 () c_epsilon
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 3 () c_delta
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 2 () c_gamma
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 1 () c_beta
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 0 () c_alpha
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	$ hg rebase
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	172	rebasing 9:d79a104e2902 "Huc" (tip)
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	173	$ hg log -G
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	174	@ 10 (monkey) Huc
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	175	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	176	o 8 (monkey) zephir
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	177	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	178	\| o 7 (elephant) babar
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 6 () c_epsilon
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 3 () c_delta
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 2 () c_gamma
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 1 () c_beta
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 0 () c_alpha
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
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	191	merge destination
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	192	=================
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	$ hg up 'ngtip(default)'
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	195	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	196	$ hg up default
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	197	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	198	$ echo zeta >> zeta
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	199	$ hg add zeta
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	200	$ hg ci -m "c_zeta"
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	201	$ hg log -G
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	202	@ 11 () c_zeta
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	203	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	204	\| o 10 (monkey) Huc
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	205	\| \|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	206	\| o 8 (monkey) zephir
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 7 (elephant) babar
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 6 () c_epsilon
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 3 () c_delta
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 2 () c_gamma
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 1 () c_beta
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 0 () c_alpha
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	219
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	220	$ hg up elephant
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	221	switching to topic elephant
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	222	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	223	$ hg rebase -d 'desc(c_zeta)' # make sure tip is elsewhere
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	224	rebasing 7:8d0b77140b05 "babar"
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	225	$ hg up monkey
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	226	switching to topic monkey
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	227	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	228	$ hg merge
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	229	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	230	(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	231	$ hg topic
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	232	elephant
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	233	* monkey
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	234	$ 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	235	$ hg topic
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	236	elephant
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	237	* monkey
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	238	$ hg log -G
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	239	@ 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	240	\|\
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	241	\| \| 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	242	\| \|/
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	243	\| o 11 () c_zeta
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	244	\| \|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	245	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	246	\| \|
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	247	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	248	\|/
1891 077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	249	o 6 () c_epsilon
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	250	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	251	o 3 () c_delta
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	252	\|
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	253	o 2 () c_gamma
077c40f206d1 rebase: test default rebase destination behavior Pierre-Yves David <pierre-yves.david@fb.com> parents: 1885 diff changeset	254	\|
1871 58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	255	o 1 () c_beta
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	256	\|
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	257	o 0 () c_alpha
58ef5699fb35 merge: use topic to pick default destination Pierre-Yves David <pierre-yves.david@fb.com> parents: 1870 diff changeset	258
1892 b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	259
1900 27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	260
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	261	Check pull --rebase
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	262	-------------------
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	263
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	264	(we broke it a some point)
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	$ cd ..
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	267	$ hg clone jungle other --rev '2'
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	268	adding changesets
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	269	adding manifests
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	270	adding file changes
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	271	added 3 changesets with 3 changes to 3 files
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	272	updating to branch default
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	273	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	274	$ cd other
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	275	$ echo other > other
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	276	$ hg add other
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	277	$ hg ci -m 'c_other'
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	278	$ hg pull -r default --rebase
2120 e38156312410 tests: add glob for Windows Matt Harbison <matt_harbison@yahoo.com> parents: 2045 diff changeset	279	pulling from $TESTTMP/jungle (glob)
1900 27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	280	searching for changes
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	281	adding changesets
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	282	adding manifests
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	283	adding file changes
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	284	added 3 changesets with 3 changes to 3 files (+1 heads)
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	285	rebasing 3:dbc48dd9e743 "c_other"
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	286	$ hg log -G
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	287	@ 7 () c_other
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	288	\|
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	289	o 6 () c_zeta
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	290	\|
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	291	o 5 () c_epsilon
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	292	\|
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	293	o 4 () c_delta
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	294	\|
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	295	o 2 () c_gamma
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	296	\|
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	297	o 1 () c_beta
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	298	\|
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	299	o 0 () c_alpha
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	300
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	301	$ cd ../jungle
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	302
27ea12c05e99 destination: fix 'hg pull --rebase' Pierre-Yves David <pierre-yves.david@fb.com> parents: 1892 diff changeset	303
1892 b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	304	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	305	===============================
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	306
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	307	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	308
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	309	$ 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	310	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	311	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	312	$ 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	313	$ 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	314	$ 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	315	$ 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	316	$ 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	317	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	318	$ 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	319	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	320	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	321	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	322	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	323	\| 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	324	\| \|\
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	325	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	326	/ /
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	327	\| 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	328	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	329	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	330	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	331	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	332	\|/
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	333	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	334	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	335	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	336	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	337	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	338	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	339	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	340	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	341	@ 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	342
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	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	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	$ 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	347	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	348	$ 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	349	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	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	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	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	\| 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	354	\| \|\
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	355	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	356	/ /
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	357	\| @ 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	358	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	359	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	360	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	361	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	362	\|/
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	363	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	364	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	365	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	366	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	367	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	368	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	369	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	370	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	371	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	372
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	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	375	(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	376
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	377	$ 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	378	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	379	$ 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	380	$ 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	381	$ 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	382	$ 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	383	@ 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	384	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	385	\| 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	386	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	387	\| 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	388	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	389	+---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	390	\| \| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	391	\| 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	392	\|/ /
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	393	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	394	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	395	\| 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	396	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	397	\| 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	398	\|/
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	399	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	400	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	401	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	402	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	403	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	404	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	405	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	406	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	407	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	408
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	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	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	$ 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	413	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	414	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	415	$ 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	416	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	417	$ 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	418	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	419	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	420	\| @ 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	421	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	422	\| 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	423	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	424	+---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	425	\| \| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	426	\| 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	427	\|/ /
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	428	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	429	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	430	\| 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	431	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	432	\| 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	433	\|/
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	434	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	435	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	436	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	437	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	438	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	439	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	440	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	441	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	442	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	443
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	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	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	$ 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	448	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	449	$ hg 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	450	$ 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	451	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	452	$ 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	453	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	454	\|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	455	\| @ 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	456	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	457	\| 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	458	\| \|
b1fadc089b82 update: change default update destination to take topic in account Pierre-Yves David <pierre-yves.david@fb.com> parents: 1891 diff changeset	459	+---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	460	\| \| \|
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 \| 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	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	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	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 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	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 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	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 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	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 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	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 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	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 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	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 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	478
1911 442a7cb8404e histedit: restrict default edited set to current topic when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 1900 diff changeset	479
442a7cb8404e histedit: restrict default edited set to current topic when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 1900 diff changeset	480	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	481	================================
442a7cb8404e histedit: restrict default edited set to current topic when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 1900 diff changeset	482
1915 cb651dbd0965 spelling: histedit timeless@gmail.com parents: 1911 diff changeset	483	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	484	(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	485
442a7cb8404e histedit: restrict default edited set to current topic when possible Pierre-Yves David <pierre-yves.david@fb.com> parents: 1900 diff changeset	486	$ 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	487	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	488	$ 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	489	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	490	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	491	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	492	# p, pick = use commit

author	Boris Feld <boris.feld@octobus.net>
	Fri, 26 May 2017 15:01:21 +0200
branch	stable
changeset 2481	d63f383e43b6
parent 2120	e38156312410
child 2679	5156a67f66a6
permissions	-rw-r--r--