equal
deleted
inserted
replaced
96 $ hg log -G |
96 $ hg log -G |
97 @ 11 - {foo} e104f49bab28 add fff (draft) |
97 @ 11 - {foo} e104f49bab28 add fff (draft) |
98 | |
98 | |
99 | o 10 - {foo} d9cacd156ffc add ddd (draft) |
99 | o 10 - {foo} d9cacd156ffc add ddd (draft) |
100 | | |
100 | | |
101 | | * 9 - {bar} 1d964213b023 add jjj (draft) |
101 | | o 9 - {bar} 1d964213b023 add jjj (draft) |
102 | | | |
102 | | | |
103 | | * 8 - {bar} fcab990f3261 add iii (draft) |
103 | | o 8 - {bar} fcab990f3261 add iii (draft) |
104 | | | |
104 | | | |
105 | | * 7 - {bar} b0c2554835ac add hhh (draft) |
105 | | o 7 - {bar} b0c2554835ac add hhh (draft) |
106 | | | |
106 | | | |
107 | | * 6 - {bar} c748293f1c1a add ggg (draft) |
107 | | o 6 - {bar} c748293f1c1a add ggg (draft) |
108 | | | |
108 | | | |
109 +---x 5 - {foo} 6a6b7365c751 add fff (draft) |
109 +---x 5 - {foo} 6a6b7365c751 add fff (draft) |
110 | | |
110 | | |
111 * | 4 - {foo} 3969ab847d9c add eee (draft) |
111 o | 4 - {foo} 3969ab847d9c add eee (draft) |
112 | | |
112 | | |
113 x | 3 - {foo} 4e3a154f38c7 add ddd (draft) |
113 x | 3 - {foo} 4e3a154f38c7 add ddd (draft) |
114 |/ |
114 |/ |
115 o 2 - {foo} cced9bac76e3 add ccc (draft) |
115 o 2 - {foo} cced9bac76e3 add ccc (draft) |
116 | |
116 | |
132 | |
132 | |
133 o 12 - {foo} 42b49017ff90 add eee (draft) |
133 o 12 - {foo} 42b49017ff90 add eee (draft) |
134 | |
134 | |
135 o 10 - {foo} d9cacd156ffc add ddd (draft) |
135 o 10 - {foo} d9cacd156ffc add ddd (draft) |
136 | |
136 | |
137 | * 9 - {bar} 1d964213b023 add jjj (draft) |
137 | o 9 - {bar} 1d964213b023 add jjj (draft) |
138 | | |
138 | | |
139 | * 8 - {bar} fcab990f3261 add iii (draft) |
139 | o 8 - {bar} fcab990f3261 add iii (draft) |
140 | | |
140 | | |
141 | * 7 - {bar} b0c2554835ac add hhh (draft) |
141 | o 7 - {bar} b0c2554835ac add hhh (draft) |
142 | | |
142 | | |
143 | * 6 - {bar} c748293f1c1a add ggg (draft) |
143 | o 6 - {bar} c748293f1c1a add ggg (draft) |
144 | | |
144 | | |
145 | x 5 - {foo} 6a6b7365c751 add fff (draft) |
145 | x 5 - {foo} 6a6b7365c751 add fff (draft) |
146 | | |
146 | | |
147 | x 4 - {foo} 3969ab847d9c add eee (draft) |
147 | x 4 - {foo} 3969ab847d9c add eee (draft) |
148 | | |
148 | | |
247 o 1 - {} a4dbed0837ea add bbb (draft) |
247 o 1 - {} a4dbed0837ea add bbb (draft) |
248 | |
248 | |
249 o 0 - {} 199cc73e9a0b add aaa (draft) |
249 o 0 - {} 199cc73e9a0b add aaa (draft) |
250 |
250 |
251 $ hg topic -r 070c5573d8f9 bar |
251 $ hg topic -r 070c5573d8f9 bar |
252 4 new orphan changesets |
|
253 changed topic on 1 changes |
252 changed topic on 1 changes |
254 $ hg up 16d6f664b17c |
253 $ hg up 16d6f664b17c |
255 switching to topic bar |
254 switching to topic bar |
256 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
255 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
257 |
256 |
273 ------------------------------------------------------------------------------ |
272 ------------------------------------------------------------------------------ |
274 |
273 |
275 $ hg log --graph |
274 $ hg log --graph |
276 @ 18 - {bar} 793eb6370b2d add fff (draft) |
275 @ 18 - {bar} 793eb6370b2d add fff (draft) |
277 | |
276 | |
278 | * 17 - {bar} 9bf430c106b7 add jjj (draft) |
277 | o 17 - {bar} 9bf430c106b7 add jjj (draft) |
279 | | |
278 | | |
280 | * 16 - {bar} d2dc89c57700 add iii (draft) |
279 | o 16 - {bar} d2dc89c57700 add iii (draft) |
281 | | |
280 | | |
282 | * 15 - {bar} 20bc4d02aa62 add hhh (draft) |
281 | o 15 - {bar} 20bc4d02aa62 add hhh (draft) |
283 | | |
282 | | |
284 | * 14 - {bar} 16d6f664b17c add ggg (draft) |
283 | o 14 - {bar} 16d6f664b17c add ggg (draft) |
285 | | |
284 | | |
286 | x 13 - {foo} 070c5573d8f9 add fff (draft) |
285 | x 13 - {foo} 070c5573d8f9 add fff (draft) |
287 |/ |
286 |/ |
288 o 12 - {foo} 42b49017ff90 add eee (draft) |
287 o 12 - {foo} 42b49017ff90 add eee (draft) |
289 | |
288 | |
309 $ hg up 20bc4d02aa62 |
308 $ hg up 20bc4d02aa62 |
310 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
309 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
311 working directory parent is obsolete! (20bc4d02aa62) |
310 working directory parent is obsolete! (20bc4d02aa62) |
312 (use 'hg evolve' to update to its successor: d834582d9ee3) |
311 (use 'hg evolve' to update to its successor: d834582d9ee3) |
313 $ hg log -Gr 14:: |
312 $ hg log -Gr 14:: |
314 * 19 - {bar} d834582d9ee3 add hhh (draft) |
313 o 19 - {bar} d834582d9ee3 add hhh (draft) |
315 | |
314 | |
316 | * 17 - {bar} 9bf430c106b7 add jjj (draft) |
315 | o 17 - {bar} 9bf430c106b7 add jjj (draft) |
317 | | |
316 | | |
318 | * 16 - {bar} d2dc89c57700 add iii (draft) |
317 | o 16 - {bar} d2dc89c57700 add iii (draft) |
319 | | |
318 | | |
320 | @ 15 - {bar} 20bc4d02aa62 add hhh (draft) |
319 | @ 15 - {bar} 20bc4d02aa62 add hhh (draft) |
321 |/ |
320 |/ |
322 * 14 - {bar} 16d6f664b17c add ggg (draft) |
321 o 14 - {bar} 16d6f664b17c add ggg (draft) |
323 | |
322 | |
324 ~ |
323 ~ |
325 |
324 |
326 $ hg prev |
325 $ hg prev |
327 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
326 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
330 When the current topic and successors topic are same, but obsolete cset has |
329 When the current topic and successors topic are same, but obsolete cset has |
331 different topic |
330 different topic |
332 |
331 |
333 $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase= |
332 $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase= |
334 rebasing 16:d2dc89c57700 "add iii" (bar) |
333 rebasing 16:d2dc89c57700 "add iii" (bar) |
335 1 new orphan changesets |
|
336 rebasing 17:9bf430c106b7 "add jjj" (bar) |
334 rebasing 17:9bf430c106b7 "add jjj" (bar) |
337 1 new orphan changesets |
|
338 $ hg log -Gr 42b49017ff90:: |
335 $ hg log -Gr 42b49017ff90:: |
339 * 21 - {bar} 7542e76aba2c add jjj (draft) |
336 o 21 - {bar} 7542e76aba2c add jjj (draft) |
340 | |
337 | |
341 * 20 - {bar} 7858bd7e9906 add iii (draft) |
338 o 20 - {bar} 7858bd7e9906 add iii (draft) |
342 | |
339 | |
343 * 19 - {bar} d834582d9ee3 add hhh (draft) |
340 o 19 - {bar} d834582d9ee3 add hhh (draft) |
344 | |
341 | |
345 | o 18 - {bar} 793eb6370b2d add fff (draft) |
342 | o 18 - {bar} 793eb6370b2d add fff (draft) |
346 | | |
343 | | |
347 @ | 14 - {bar} 16d6f664b17c add ggg (draft) |
344 @ | 14 - {bar} 16d6f664b17c add ggg (draft) |
348 | | |
345 | | |