| author | Pierre-Yves David <pierre-yves.david@fb.com> |
| Sat, 12 Mar 2016 15:36:17 +0000 | |
| changeset 1885 | d49f75eab6a3 |
| parent 1875 | 9eba8561870b |
| child 1891 | 077c40f206d1 |
| permissions | -rw-r--r-- |
|
1870
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
1 |
$ . "$TESTDIR/testlib" |
|
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= |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
8 |
> [phases] |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
9 |
> publish=false |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
10 |
> [ui] |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
11 |
> logtemplate = '{rev} ({topics}) {desc}\n' |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
12 |
> EOF |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
13 |
|
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
14 |
$ 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
|
15 |
> echo file $x >> $x |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
16 |
> hg add $x |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
17 |
> hg ci -m "c_$x" |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
18 |
> done |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
19 |
|
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
20 |
Test NGTip feature |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
21 |
================== |
|
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 |
Simple linear case |
|
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 |
$ echo babar >> jungle |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
26 |
$ hg add jungle |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
27 |
$ hg ci -t elephant -m babar |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
28 |
|
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
29 |
$ hg log -G |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
30 |
@ 4 (elephant) 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 |
o 3 () c_delta |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
33 |
| |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
34 |
o 2 () c_gamma |
|
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 1 () c_beta |
|
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 0 () c_alpha |
|
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 |
$ hg log -r 'ngtip(.)' |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
41 |
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
|
42 |
$ 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
|
43 |
3 () c_delta |
|
1870
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
44 |
|
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
45 |
|
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
46 |
multiple heads with topic |
|
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 |
$ hg up "desc('c_beta')" |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
49 |
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
|
50 |
$ echo zephir >> jungle |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
51 |
$ hg add jungle |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
52 |
$ hg ci -t monkey -m zephir |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
53 |
created new head |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
54 |
$ hg log -G |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
55 |
@ 5 (monkey) zephir |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
56 |
| |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
57 |
| o 4 (elephant) babar |
|
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 3 () c_delta |
|
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 2 () c_gamma |
|
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 1 () c_beta |
|
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 0 () c_alpha |
|
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 |
$ hg log -r 'ngtip(.)' |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
68 |
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
|
69 |
$ 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
|
70 |
3 () c_delta |
|
1870
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
71 |
|
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
72 |
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
|
73 |
|
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
74 |
$ hg up "desc('c_delta')" |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
75 |
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
|
76 |
$ echo epsilon >> epsilon |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
77 |
$ hg add epsilon |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
78 |
$ hg ci -m "c_epsilon" |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
79 |
$ hg log -G |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
80 |
@ 6 () c_epsilon |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
81 |
| |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
82 |
| o 5 (monkey) zephir |
|
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 4 (elephant) babar |
|
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 | 3 () c_delta |
|
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 | 2 () c_gamma |
|
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 1 () c_beta |
|
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 0 () c_alpha |
|
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 |
$ hg log -r 'ngtip(.)' |
|
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
95 |
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
|
96 |
$ 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
|
97 |
6 () c_epsilon |
|
1870
8dd5200b4086
topic: introduce a 'ngtip' concept
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
diff
changeset
|
98 |
|
|
1871
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
99 |
merge destination |
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
100 |
================= |
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
101 |
|
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
102 |
$ hg up 'ngtip(default)' |
|
1875
9eba8561870b
test-topic-dest: test fixes I should have put in the previous change
Augie Fackler <raf@durin42.com>
parents:
1871
diff
changeset
|
103 |
0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
1885
d49f75eab6a3
topic: take topic in account for all branch head computation
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1875
diff
changeset
|
104 |
$ hg up default |
|
d49f75eab6a3
topic: take topic in account for all branch head computation
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1875
diff
changeset
|
105 |
0 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
|
106 |
$ echo zeta >> zeta |
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
107 |
$ hg add zeta |
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
108 |
$ hg ci -m "c_zeta" |
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
109 |
$ hg log -G |
|
1875
9eba8561870b
test-topic-dest: test fixes I should have put in the previous change
Augie Fackler <raf@durin42.com>
parents:
1871
diff
changeset
|
110 |
@ 7 () c_zeta |
|
1871
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
111 |
| |
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
112 |
o 6 () c_epsilon |
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
113 |
| |
|
1875
9eba8561870b
test-topic-dest: test fixes I should have put in the previous change
Augie Fackler <raf@durin42.com>
parents:
1871
diff
changeset
|
114 |
| 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
|
115 |
| | |
|
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 4 (elephant) babar |
|
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 |
|
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
126 |
$ hg up elephant |
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
127 |
switching to topic elephant |
|
1875
9eba8561870b
test-topic-dest: test fixes I should have put in the previous change
Augie Fackler <raf@durin42.com>
parents:
1871
diff
changeset
|
128 |
1 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
9eba8561870b
test-topic-dest: test fixes I should have put in the previous change
Augie Fackler <raf@durin42.com>
parents:
1871
diff
changeset
|
129 |
$ hg rebase -d 7 # make sure tip is elsewhere |
|
9eba8561870b
test-topic-dest: test fixes I should have put in the previous change
Augie Fackler <raf@durin42.com>
parents:
1871
diff
changeset
|
130 |
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
|
131 |
$ hg up monkey |
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
132 |
switching to topic monkey |
|
1875
9eba8561870b
test-topic-dest: test fixes I should have put in the previous change
Augie Fackler <raf@durin42.com>
parents:
1871
diff
changeset
|
133 |
1 files updated, 0 files merged, 4 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
|
134 |
$ hg merge |
|
1875
9eba8561870b
test-topic-dest: test fixes I should have put in the previous change
Augie Fackler <raf@durin42.com>
parents:
1871
diff
changeset
|
135 |
4 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
|
136 |
(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
|
137 |
$ hg topic |
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
138 |
elephant |
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
139 |
* monkey |
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
140 |
$ 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
|
141 |
$ hg topic |
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
142 |
elephant |
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
143 |
* monkey |
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
144 |
$ hg log -G |
|
1875
9eba8561870b
test-topic-dest: test fixes I should have put in the previous change
Augie Fackler <raf@durin42.com>
parents:
1871
diff
changeset
|
145 |
@ 9 (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
|
146 |
|\ |
|
1875
9eba8561870b
test-topic-dest: test fixes I should have put in the previous change
Augie Fackler <raf@durin42.com>
parents:
1871
diff
changeset
|
147 |
| | o 8 (elephant) babar |
|
1871
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
148 |
| |/ |
|
1875
9eba8561870b
test-topic-dest: test fixes I should have put in the previous change
Augie Fackler <raf@durin42.com>
parents:
1871
diff
changeset
|
149 |
| o 7 () c_zeta |
|
1871
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
150 |
| | |
|
1875
9eba8561870b
test-topic-dest: test fixes I should have put in the previous change
Augie Fackler <raf@durin42.com>
parents:
1871
diff
changeset
|
151 |
| o 6 () c_epsilon |
|
9eba8561870b
test-topic-dest: test fixes I should have put in the previous change
Augie Fackler <raf@durin42.com>
parents:
1871
diff
changeset
|
152 |
| | |
|
9eba8561870b
test-topic-dest: test fixes I should have put in the previous change
Augie Fackler <raf@durin42.com>
parents:
1871
diff
changeset
|
153 |
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
|
154 |
| | |
|
9eba8561870b
test-topic-dest: test fixes I should have put in the previous change
Augie Fackler <raf@durin42.com>
parents:
1871
diff
changeset
|
155 |
| 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
|
156 |
| | |
|
9eba8561870b
test-topic-dest: test fixes I should have put in the previous change
Augie Fackler <raf@durin42.com>
parents:
1871
diff
changeset
|
157 |
| o 2 () c_gamma |
|
1871
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
158 |
|/ |
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
159 |
o 1 () c_beta |
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
160 |
| |
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
161 |
o 0 () c_alpha |
|
58ef5699fb35
merge: use topic to pick default destination
Pierre-Yves David <pierre-yves.david@fb.com>
parents:
1870
diff
changeset
|
162 |
|