Show More
| @@ -1,313 +1,307 b'' | |||||
| 1 | $ echo "[extensions]" >> $HGRCPATH |
|
1 | $ echo "[extensions]" >> $HGRCPATH | |
| 2 | $ echo "graphlog=" >> $HGRCPATH |
|
2 | $ echo "graphlog=" >> $HGRCPATH | |
| 3 |
|
3 | |||
| 4 | plain |
|
4 | plain | |
| 5 |
|
5 | |||
| 6 | $ rm -rf repo |
|
6 | $ hg init | |
| 7 | $ hg init repo |
|
|||
| 8 | $ cd repo |
|
|||
| 9 | $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' |
|
7 | $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' | |
| 10 | tags |
|
8 | tags | |
| 11 | $ cat .hg/localtags |
|
9 | $ cat .hg/localtags | |
| 12 | 66f7d451a68b85ed82ff5fcc254daf50c74144bd f |
|
10 | 66f7d451a68b85ed82ff5fcc254daf50c74144bd f | |
| 13 | bebd167eb94d257ace0e814aeb98e6972ed2970d p2 |
|
11 | bebd167eb94d257ace0e814aeb98e6972ed2970d p2 | |
| 14 | dag |
|
12 | dag | |
| 15 | $ hg debugdag -t -b |
|
13 | $ hg debugdag -t -b | |
| 16 | +2:f |
|
14 | +2:f | |
| 17 | +3:p2 |
|
15 | +3:p2 | |
| 18 | @temp*f+3 |
|
16 | @temp*f+3 | |
| 19 | @default*/p2+2:tip |
|
17 | @default*/p2+2:tip | |
| 20 | tip |
|
18 | tip | |
| 21 | $ hg id |
|
19 | $ hg id | |
| 22 | 000000000000 |
|
20 | 000000000000 | |
| 23 | glog |
|
21 | glog | |
| 24 | $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n' |
|
22 | $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n' | |
| 25 | o 11: r11 [] @ 11.00 |
|
23 | o 11: r11 [] @ 11.00 | |
| 26 | | |
|
24 | | | |
| 27 | o 10: r10 [] @ 10.00 |
|
25 | o 10: r10 [] @ 10.00 | |
| 28 | | |
|
26 | | | |
| 29 | o 9: r9 [] @ 9.00 |
|
27 | o 9: r9 [] @ 9.00 | |
| 30 | |\ |
|
28 | |\ | |
| 31 | | o 8: r8 [temp] @ 8.00 |
|
29 | | o 8: r8 [temp] @ 8.00 | |
| 32 | | | |
|
30 | | | | |
| 33 | | o 7: r7 [temp] @ 7.00 |
|
31 | | o 7: r7 [temp] @ 7.00 | |
| 34 | | | |
|
32 | | | | |
| 35 | | o 6: r6 [temp] @ 6.00 |
|
33 | | o 6: r6 [temp] @ 6.00 | |
| 36 | | | |
|
34 | | | | |
| 37 | | o 5: r5 [temp] @ 5.00 |
|
35 | | o 5: r5 [temp] @ 5.00 | |
| 38 | | | |
|
36 | | | | |
| 39 | o | 4: r4 [] @ 4.00 |
|
37 | o | 4: r4 [] @ 4.00 | |
| 40 | | | |
|
38 | | | | |
| 41 | o | 3: r3 [] @ 3.00 |
|
39 | o | 3: r3 [] @ 3.00 | |
| 42 | | | |
|
40 | | | | |
| 43 | o | 2: r2 [] @ 2.00 |
|
41 | o | 2: r2 [] @ 2.00 | |
| 44 | |/ |
|
42 | |/ | |
| 45 | o 1: r1 [] @ 1.00 |
|
43 | o 1: r1 [] @ 1.00 | |
| 46 | | |
|
44 | | | |
| 47 | o 0: r0 [] @ 0.00 |
|
45 | o 0: r0 [] @ 0.00 | |
| 48 |
|
46 | |||
| 49 |
|
47 | |||
| 50 | overwritten files |
|
48 | overwritten files | |
| 51 |
|
49 | |||
| 52 |
$ rm -r |
|
50 | $ rm -r .hg | |
| 53 |
$ hg init |
|
51 | $ hg init | |
| 54 | $ cd repo |
|
|||
| 55 | $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -o |
|
52 | $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -o | |
| 56 | tags |
|
53 | tags | |
| 57 | $ cat .hg/localtags |
|
54 | $ cat .hg/localtags | |
| 58 | 2a8ed67d317e370eac733dccc501b12d7b9c441a f |
|
55 | 2a8ed67d317e370eac733dccc501b12d7b9c441a f | |
| 59 | 4226a30965b7af58f94d0cda7e6c2c9c63e6bf90 p2 |
|
56 | 4226a30965b7af58f94d0cda7e6c2c9c63e6bf90 p2 | |
| 60 | dag |
|
57 | dag | |
| 61 | $ hg debugdag -t -b |
|
58 | $ hg debugdag -t -b | |
| 62 | +2:f |
|
59 | +2:f | |
| 63 | +3:p2 |
|
60 | +3:p2 | |
| 64 | @temp*f+3 |
|
61 | @temp*f+3 | |
| 65 | @default*/p2+2:tip |
|
62 | @default*/p2+2:tip | |
| 66 | tip |
|
63 | tip | |
| 67 | $ hg id |
|
64 | $ hg id | |
| 68 | 000000000000 |
|
65 | 000000000000 | |
| 69 | glog |
|
66 | glog | |
| 70 | $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n' |
|
67 | $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n' | |
| 71 | o 11: r11 [] @ 11.00 |
|
68 | o 11: r11 [] @ 11.00 | |
| 72 | | |
|
69 | | | |
| 73 | o 10: r10 [] @ 10.00 |
|
70 | o 10: r10 [] @ 10.00 | |
| 74 | | |
|
71 | | | |
| 75 | o 9: r9 [] @ 9.00 |
|
72 | o 9: r9 [] @ 9.00 | |
| 76 | |\ |
|
73 | |\ | |
| 77 | | o 8: r8 [temp] @ 8.00 |
|
74 | | o 8: r8 [temp] @ 8.00 | |
| 78 | | | |
|
75 | | | | |
| 79 | | o 7: r7 [temp] @ 7.00 |
|
76 | | o 7: r7 [temp] @ 7.00 | |
| 80 | | | |
|
77 | | | | |
| 81 | | o 6: r6 [temp] @ 6.00 |
|
78 | | o 6: r6 [temp] @ 6.00 | |
| 82 | | | |
|
79 | | | | |
| 83 | | o 5: r5 [temp] @ 5.00 |
|
80 | | o 5: r5 [temp] @ 5.00 | |
| 84 | | | |
|
81 | | | | |
| 85 | o | 4: r4 [] @ 4.00 |
|
82 | o | 4: r4 [] @ 4.00 | |
| 86 | | | |
|
83 | | | | |
| 87 | o | 3: r3 [] @ 3.00 |
|
84 | o | 3: r3 [] @ 3.00 | |
| 88 | | | |
|
85 | | | | |
| 89 | o | 2: r2 [] @ 2.00 |
|
86 | o | 2: r2 [] @ 2.00 | |
| 90 | |/ |
|
87 | |/ | |
| 91 | o 1: r1 [] @ 1.00 |
|
88 | o 1: r1 [] @ 1.00 | |
| 92 | | |
|
89 | | | |
| 93 | o 0: r0 [] @ 0.00 |
|
90 | o 0: r0 [] @ 0.00 | |
| 94 |
|
91 | |||
| 95 | glog of |
|
92 | glog of | |
| 96 | $ hg glog --template '{rev}: {desc} [{branches}]\n' of |
|
93 | $ hg glog --template '{rev}: {desc} [{branches}]\n' of | |
| 97 | o 11: r11 [] |
|
94 | o 11: r11 [] | |
| 98 | | |
|
95 | | | |
| 99 | o 10: r10 [] |
|
96 | o 10: r10 [] | |
| 100 | | |
|
97 | | | |
| 101 | o 9: r9 [] |
|
98 | o 9: r9 [] | |
| 102 | |\ |
|
99 | |\ | |
| 103 | | o 8: r8 [temp] |
|
100 | | o 8: r8 [temp] | |
| 104 | | | |
|
101 | | | | |
| 105 | | o 7: r7 [temp] |
|
102 | | o 7: r7 [temp] | |
| 106 | | | |
|
103 | | | | |
| 107 | | o 6: r6 [temp] |
|
104 | | o 6: r6 [temp] | |
| 108 | | | |
|
105 | | | | |
| 109 | | o 5: r5 [temp] |
|
106 | | o 5: r5 [temp] | |
| 110 | | | |
|
107 | | | | |
| 111 | o | 4: r4 [] |
|
108 | o | 4: r4 [] | |
| 112 | | | |
|
109 | | | | |
| 113 | o | 3: r3 [] |
|
110 | o | 3: r3 [] | |
| 114 | | | |
|
111 | | | | |
| 115 | o | 2: r2 [] |
|
112 | o | 2: r2 [] | |
| 116 | |/ |
|
113 | |/ | |
| 117 | o 1: r1 [] |
|
114 | o 1: r1 [] | |
| 118 | | |
|
115 | | | |
| 119 | o 0: r0 [] |
|
116 | o 0: r0 [] | |
| 120 |
|
117 | |||
| 121 | tags |
|
118 | tags | |
| 122 | $ hg tags -v |
|
119 | $ hg tags -v | |
| 123 | tip 11:58a51e5eb988 |
|
120 | tip 11:58a51e5eb988 | |
| 124 | p2 4:4226a30965b7 local |
|
121 | p2 4:4226a30965b7 local | |
| 125 | f 1:2a8ed67d317e local |
|
122 | f 1:2a8ed67d317e local | |
| 126 | cat of |
|
123 | cat of | |
| 127 | $ hg cat of --rev tip |
|
124 | $ hg cat of --rev tip | |
| 128 | r11 |
|
125 | r11 | |
| 129 | $ cd .. |
|
|||
| 130 |
|
126 | |||
| 131 |
|
127 | |||
| 132 | new and mergeable files |
|
128 | new and mergeable files | |
| 133 |
|
129 | |||
| 134 |
$ rm -r |
|
130 | $ rm -r .hg | |
| 135 |
$ hg init |
|
131 | $ hg init | |
| 136 | $ cd repo |
|
|||
| 137 | $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -mn |
|
132 | $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -mn | |
| 138 | dag |
|
133 | dag | |
| 139 | $ hg debugdag -t -b |
|
134 | $ hg debugdag -t -b | |
| 140 | +2:f |
|
135 | +2:f | |
| 141 | +3:p2 |
|
136 | +3:p2 | |
| 142 | @temp*f+3 |
|
137 | @temp*f+3 | |
| 143 | @default*/p2+2:tip |
|
138 | @default*/p2+2:tip | |
| 144 | tip |
|
139 | tip | |
| 145 | $ hg id |
|
140 | $ hg id | |
| 146 | 000000000000 |
|
141 | 000000000000 | |
| 147 | glog |
|
142 | glog | |
| 148 | $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n' |
|
143 | $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n' | |
| 149 | o 11: r11 [] @ 11.00 |
|
144 | o 11: r11 [] @ 11.00 | |
| 150 | | |
|
145 | | | |
| 151 | o 10: r10 [] @ 10.00 |
|
146 | o 10: r10 [] @ 10.00 | |
| 152 | | |
|
147 | | | |
| 153 | o 9: r9 [] @ 9.00 |
|
148 | o 9: r9 [] @ 9.00 | |
| 154 | |\ |
|
149 | |\ | |
| 155 | | o 8: r8 [temp] @ 8.00 |
|
150 | | o 8: r8 [temp] @ 8.00 | |
| 156 | | | |
|
151 | | | | |
| 157 | | o 7: r7 [temp] @ 7.00 |
|
152 | | o 7: r7 [temp] @ 7.00 | |
| 158 | | | |
|
153 | | | | |
| 159 | | o 6: r6 [temp] @ 6.00 |
|
154 | | o 6: r6 [temp] @ 6.00 | |
| 160 | | | |
|
155 | | | | |
| 161 | | o 5: r5 [temp] @ 5.00 |
|
156 | | o 5: r5 [temp] @ 5.00 | |
| 162 | | | |
|
157 | | | | |
| 163 | o | 4: r4 [] @ 4.00 |
|
158 | o | 4: r4 [] @ 4.00 | |
| 164 | | | |
|
159 | | | | |
| 165 | o | 3: r3 [] @ 3.00 |
|
160 | o | 3: r3 [] @ 3.00 | |
| 166 | | | |
|
161 | | | | |
| 167 | o | 2: r2 [] @ 2.00 |
|
162 | o | 2: r2 [] @ 2.00 | |
| 168 | |/ |
|
163 | |/ | |
| 169 | o 1: r1 [] @ 1.00 |
|
164 | o 1: r1 [] @ 1.00 | |
| 170 | | |
|
165 | | | |
| 171 | o 0: r0 [] @ 0.00 |
|
166 | o 0: r0 [] @ 0.00 | |
| 172 |
|
167 | |||
| 173 | glog mf |
|
168 | glog mf | |
| 174 | $ hg glog --template '{rev}: {desc} [{branches}]\n' mf |
|
169 | $ hg glog --template '{rev}: {desc} [{branches}]\n' mf | |
| 175 | o 11: r11 [] |
|
170 | o 11: r11 [] | |
| 176 | | |
|
171 | | | |
| 177 | o 10: r10 [] |
|
172 | o 10: r10 [] | |
| 178 | | |
|
173 | | | |
| 179 | o 9: r9 [] |
|
174 | o 9: r9 [] | |
| 180 | |\ |
|
175 | |\ | |
| 181 | | o 8: r8 [temp] |
|
176 | | o 8: r8 [temp] | |
| 182 | | | |
|
177 | | | | |
| 183 | | o 7: r7 [temp] |
|
178 | | o 7: r7 [temp] | |
| 184 | | | |
|
179 | | | | |
| 185 | | o 6: r6 [temp] |
|
180 | | o 6: r6 [temp] | |
| 186 | | | |
|
181 | | | | |
| 187 | | o 5: r5 [temp] |
|
182 | | o 5: r5 [temp] | |
| 188 | | | |
|
183 | | | | |
| 189 | o | 4: r4 [] |
|
184 | o | 4: r4 [] | |
| 190 | | | |
|
185 | | | | |
| 191 | o | 3: r3 [] |
|
186 | o | 3: r3 [] | |
| 192 | | | |
|
187 | | | | |
| 193 | o | 2: r2 [] |
|
188 | o | 2: r2 [] | |
| 194 | |/ |
|
189 | |/ | |
| 195 | o 1: r1 [] |
|
190 | o 1: r1 [] | |
| 196 | | |
|
191 | | | |
| 197 | o 0: r0 [] |
|
192 | o 0: r0 [] | |
| 198 |
|
193 | |||
| 199 |
|
194 | |||
| 200 | man r4 |
|
195 | man r4 | |
| 201 | $ hg manifest -r4 |
|
196 | $ hg manifest -r4 | |
| 202 | mf |
|
197 | mf | |
| 203 | nf0 |
|
198 | nf0 | |
| 204 | nf1 |
|
199 | nf1 | |
| 205 | nf2 |
|
200 | nf2 | |
| 206 | nf3 |
|
201 | nf3 | |
| 207 | nf4 |
|
202 | nf4 | |
| 208 | cat r4 mf |
|
203 | cat r4 mf | |
| 209 | $ hg cat -r4 mf |
|
204 | $ hg cat -r4 mf | |
| 210 | 0 r0 |
|
205 | 0 r0 | |
| 211 | 1 |
|
206 | 1 | |
| 212 | 2 r1 |
|
207 | 2 r1 | |
| 213 | 3 |
|
208 | 3 | |
| 214 | 4 r2 |
|
209 | 4 r2 | |
| 215 | 5 |
|
210 | 5 | |
| 216 | 6 r3 |
|
211 | 6 r3 | |
| 217 | 7 |
|
212 | 7 | |
| 218 | 8 r4 |
|
213 | 8 r4 | |
| 219 | 9 |
|
214 | 9 | |
| 220 | 10 |
|
215 | 10 | |
| 221 | 11 |
|
216 | 11 | |
| 222 | 12 |
|
217 | 12 | |
| 223 | 13 |
|
218 | 13 | |
| 224 | 14 |
|
219 | 14 | |
| 225 | 15 |
|
220 | 15 | |
| 226 | 16 |
|
221 | 16 | |
| 227 | 17 |
|
222 | 17 | |
| 228 | 18 |
|
223 | 18 | |
| 229 | 19 |
|
224 | 19 | |
| 230 | 20 |
|
225 | 20 | |
| 231 | 21 |
|
226 | 21 | |
| 232 | 22 |
|
227 | 22 | |
| 233 | 23 |
|
228 | 23 | |
| 234 | man r8 |
|
229 | man r8 | |
| 235 | $ hg manifest -r8 |
|
230 | $ hg manifest -r8 | |
| 236 | mf |
|
231 | mf | |
| 237 | nf0 |
|
232 | nf0 | |
| 238 | nf1 |
|
233 | nf1 | |
| 239 | nf5 |
|
234 | nf5 | |
| 240 | nf6 |
|
235 | nf6 | |
| 241 | nf7 |
|
236 | nf7 | |
| 242 | nf8 |
|
237 | nf8 | |
| 243 | cat r8 mf |
|
238 | cat r8 mf | |
| 244 | $ hg cat -r8 mf |
|
239 | $ hg cat -r8 mf | |
| 245 | 0 r0 |
|
240 | 0 r0 | |
| 246 | 1 |
|
241 | 1 | |
| 247 | 2 r1 |
|
242 | 2 r1 | |
| 248 | 3 |
|
243 | 3 | |
| 249 | 4 |
|
244 | 4 | |
| 250 | 5 |
|
245 | 5 | |
| 251 | 6 |
|
246 | 6 | |
| 252 | 7 |
|
247 | 7 | |
| 253 | 8 |
|
248 | 8 | |
| 254 | 9 |
|
249 | 9 | |
| 255 | 10 r5 |
|
250 | 10 r5 | |
| 256 | 11 |
|
251 | 11 | |
| 257 | 12 r6 |
|
252 | 12 r6 | |
| 258 | 13 |
|
253 | 13 | |
| 259 | 14 r7 |
|
254 | 14 r7 | |
| 260 | 15 |
|
255 | 15 | |
| 261 | 16 r8 |
|
256 | 16 r8 | |
| 262 | 17 |
|
257 | 17 | |
| 263 | 18 |
|
258 | 18 | |
| 264 | 19 |
|
259 | 19 | |
| 265 | 20 |
|
260 | 20 | |
| 266 | 21 |
|
261 | 21 | |
| 267 | 22 |
|
262 | 22 | |
| 268 | 23 |
|
263 | 23 | |
| 269 | man |
|
264 | man | |
| 270 | $ hg manifest --rev tip |
|
265 | $ hg manifest --rev tip | |
| 271 | mf |
|
266 | mf | |
| 272 | nf0 |
|
267 | nf0 | |
| 273 | nf1 |
|
268 | nf1 | |
| 274 | nf10 |
|
269 | nf10 | |
| 275 | nf11 |
|
270 | nf11 | |
| 276 | nf2 |
|
271 | nf2 | |
| 277 | nf3 |
|
272 | nf3 | |
| 278 | nf4 |
|
273 | nf4 | |
| 279 | nf5 |
|
274 | nf5 | |
| 280 | nf6 |
|
275 | nf6 | |
| 281 | nf7 |
|
276 | nf7 | |
| 282 | nf8 |
|
277 | nf8 | |
| 283 | nf9 |
|
278 | nf9 | |
| 284 | cat mf |
|
279 | cat mf | |
| 285 | $ hg cat mf --rev tip |
|
280 | $ hg cat mf --rev tip | |
| 286 | 0 r0 |
|
281 | 0 r0 | |
| 287 | 1 |
|
282 | 1 | |
| 288 | 2 r1 |
|
283 | 2 r1 | |
| 289 | 3 |
|
284 | 3 | |
| 290 | 4 r2 |
|
285 | 4 r2 | |
| 291 | 5 |
|
286 | 5 | |
| 292 | 6 r3 |
|
287 | 6 r3 | |
| 293 | 7 |
|
288 | 7 | |
| 294 | 8 r4 |
|
289 | 8 r4 | |
| 295 | 9 |
|
290 | 9 | |
| 296 | 10 r5 |
|
291 | 10 r5 | |
| 297 | 11 |
|
292 | 11 | |
| 298 | 12 r6 |
|
293 | 12 r6 | |
| 299 | 13 |
|
294 | 13 | |
| 300 | 14 r7 |
|
295 | 14 r7 | |
| 301 | 15 |
|
296 | 15 | |
| 302 | 16 r8 |
|
297 | 16 r8 | |
| 303 | 17 |
|
298 | 17 | |
| 304 | 18 r9 |
|
299 | 18 r9 | |
| 305 | 19 |
|
300 | 19 | |
| 306 | 20 r10 |
|
301 | 20 r10 | |
| 307 | 21 |
|
302 | 21 | |
| 308 | 22 r11 |
|
303 | 22 r11 | |
| 309 | 23 |
|
304 | 23 | |
| 310 | $ cd .. |
|
|||
| 311 |
|
305 | |||
| 312 |
|
306 | |||
| 313 |
|
307 | |||
General Comments 0
You need to be logged in to leave comments.
Login now