equal
deleted
inserted
replaced
98 $ hg log -G |
98 $ hg log -G |
99 @ 11 - {foo} e104f49bab28 add fff (draft) |
99 @ 11 - {foo} e104f49bab28 add fff (draft) |
100 | |
100 | |
101 | o 10 - {foo} d9cacd156ffc add ddd (draft) |
101 | o 10 - {foo} d9cacd156ffc add ddd (draft) |
102 | | |
102 | | |
103 | | * 9 - {bar} 1d964213b023 add jjj (draft) |
103 | | o 9 - {bar} 1d964213b023 add jjj (draft) |
104 | | | |
104 | | | |
105 | | * 8 - {bar} fcab990f3261 add iii (draft) |
105 | | o 8 - {bar} fcab990f3261 add iii (draft) |
106 | | | |
106 | | | |
107 | | * 7 - {bar} b0c2554835ac add hhh (draft) |
107 | | o 7 - {bar} b0c2554835ac add hhh (draft) |
108 | | | |
108 | | | |
109 | | * 6 - {bar} c748293f1c1a add ggg (draft) |
109 | | o 6 - {bar} c748293f1c1a add ggg (draft) |
110 | | | |
110 | | | |
111 +---x 5 - {foo} 6a6b7365c751 add fff (draft) |
111 +---x 5 - {foo} 6a6b7365c751 add fff (draft) |
112 | | |
112 | | |
113 * | 4 - {foo} 3969ab847d9c add eee (draft) |
113 o | 4 - {foo} 3969ab847d9c add eee (draft) |
114 | | |
114 | | |
115 x | 3 - {foo} 4e3a154f38c7 add ddd (draft) |
115 x | 3 - {foo} 4e3a154f38c7 add ddd (draft) |
116 |/ |
116 |/ |
117 o 2 - {foo} cced9bac76e3 add ccc (draft) |
117 o 2 - {foo} cced9bac76e3 add ccc (draft) |
118 | |
118 | |
142 | |
142 | |
143 o 12 - {foo} 42b49017ff90 add eee (draft) |
143 o 12 - {foo} 42b49017ff90 add eee (draft) |
144 | |
144 | |
145 o 10 - {foo} d9cacd156ffc add ddd (draft) |
145 o 10 - {foo} d9cacd156ffc add ddd (draft) |
146 | |
146 | |
147 | * 9 - {bar} 1d964213b023 add jjj (draft) |
147 | o 9 - {bar} 1d964213b023 add jjj (draft) |
148 | | |
148 | | |
149 | * 8 - {bar} fcab990f3261 add iii (draft) |
149 | o 8 - {bar} fcab990f3261 add iii (draft) |
150 | | |
150 | | |
151 | * 7 - {bar} b0c2554835ac add hhh (draft) |
151 | o 7 - {bar} b0c2554835ac add hhh (draft) |
152 | | |
152 | | |
153 | * 6 - {bar} c748293f1c1a add ggg (draft) |
153 | o 6 - {bar} c748293f1c1a add ggg (draft) |
154 | | |
154 | | |
155 | x 5 - {foo} 6a6b7365c751 add fff (draft) |
155 | x 5 - {foo} 6a6b7365c751 add fff (draft) |
156 | | |
156 | | |
157 | x 4 - {foo} 3969ab847d9c add eee (draft) |
157 | x 4 - {foo} 3969ab847d9c add eee (draft) |
158 | | |
158 | | |
254 o 1 - {} a4dbed0837ea add bbb (draft) |
254 o 1 - {} a4dbed0837ea add bbb (draft) |
255 | |
255 | |
256 o 0 - {} 199cc73e9a0b add aaa (draft) |
256 o 0 - {} 199cc73e9a0b add aaa (draft) |
257 |
257 |
258 $ hg topic -r 070c5573d8f9 bar |
258 $ hg topic -r 070c5573d8f9 bar |
259 4 new orphan changesets |
|
260 changed topic on 1 changes |
259 changed topic on 1 changes |
261 $ hg up 16d6f664b17c |
260 $ hg up 16d6f664b17c |
262 switching to topic bar |
261 switching to topic bar |
263 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
262 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
264 |
263 |
280 ------------------------------------------------------------------------------ |
279 ------------------------------------------------------------------------------ |
281 |
280 |
282 $ hg log --graph |
281 $ hg log --graph |
283 @ 18 - {bar} 793eb6370b2d add fff (draft) |
282 @ 18 - {bar} 793eb6370b2d add fff (draft) |
284 | |
283 | |
285 | * 17 - {bar} 9bf430c106b7 add jjj (draft) |
284 | o 17 - {bar} 9bf430c106b7 add jjj (draft) |
286 | | |
285 | | |
287 | * 16 - {bar} d2dc89c57700 add iii (draft) |
286 | o 16 - {bar} d2dc89c57700 add iii (draft) |
288 | | |
287 | | |
289 | * 15 - {bar} 20bc4d02aa62 add hhh (draft) |
288 | o 15 - {bar} 20bc4d02aa62 add hhh (draft) |
290 | | |
289 | | |
291 | * 14 - {bar} 16d6f664b17c add ggg (draft) |
290 | o 14 - {bar} 16d6f664b17c add ggg (draft) |
292 | | |
291 | | |
293 | x 13 - {foo} 070c5573d8f9 add fff (draft) |
292 | x 13 - {foo} 070c5573d8f9 add fff (draft) |
294 |/ |
293 |/ |
295 o 12 - {foo} 42b49017ff90 add eee (draft) |
294 o 12 - {foo} 42b49017ff90 add eee (draft) |
296 | |
295 | |
316 $ hg up 20bc4d02aa62 |
315 $ hg up 20bc4d02aa62 |
317 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
316 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
318 working directory parent is obsolete! (20bc4d02aa62) |
317 working directory parent is obsolete! (20bc4d02aa62) |
319 (use 'hg evolve' to update to its successor: d834582d9ee3) |
318 (use 'hg evolve' to update to its successor: d834582d9ee3) |
320 $ hg log -Gr 14:: |
319 $ hg log -Gr 14:: |
321 * 19 - {bar} d834582d9ee3 add hhh (draft) |
320 o 19 - {bar} d834582d9ee3 add hhh (draft) |
322 | |
321 | |
323 | * 17 - {bar} 9bf430c106b7 add jjj (draft) |
322 | o 17 - {bar} 9bf430c106b7 add jjj (draft) |
324 | | |
323 | | |
325 | * 16 - {bar} d2dc89c57700 add iii (draft) |
324 | o 16 - {bar} d2dc89c57700 add iii (draft) |
326 | | |
325 | | |
327 | @ 15 - {bar} 20bc4d02aa62 add hhh (draft) |
326 | @ 15 - {bar} 20bc4d02aa62 add hhh (draft) |
328 |/ |
327 |/ |
329 * 14 - {bar} 16d6f664b17c add ggg (draft) |
328 o 14 - {bar} 16d6f664b17c add ggg (draft) |
330 | |
329 | |
331 ~ |
330 ~ |
332 |
331 |
333 $ hg prev |
332 $ hg prev |
334 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
333 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
337 When the current topic and successors topic are same, but obsolete cset has |
336 When the current topic and successors topic are same, but obsolete cset has |
338 different topic |
337 different topic |
339 |
338 |
340 $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase= |
339 $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase= |
341 rebasing 16:d2dc89c57700 "add iii" (bar) |
340 rebasing 16:d2dc89c57700 "add iii" (bar) |
342 1 new orphan changesets |
|
343 rebasing 17:9bf430c106b7 "add jjj" (bar) |
341 rebasing 17:9bf430c106b7 "add jjj" (bar) |
344 1 new orphan changesets |
|
345 $ hg log -Gr 42b49017ff90:: |
342 $ hg log -Gr 42b49017ff90:: |
346 * 21 - {bar} 7542e76aba2c add jjj (draft) |
343 o 21 - {bar} 7542e76aba2c add jjj (draft) |
347 | |
344 | |
348 * 20 - {bar} 7858bd7e9906 add iii (draft) |
345 o 20 - {bar} 7858bd7e9906 add iii (draft) |
349 | |
346 | |
350 * 19 - {bar} d834582d9ee3 add hhh (draft) |
347 o 19 - {bar} d834582d9ee3 add hhh (draft) |
351 | |
348 | |
352 | o 18 - {bar} 793eb6370b2d add fff (draft) |
349 | o 18 - {bar} 793eb6370b2d add fff (draft) |
353 | | |
350 | | |
354 @ | 14 - {bar} 16d6f664b17c add ggg (draft) |
351 @ | 14 - {bar} 16d6f664b17c add ggg (draft) |
355 | | |
352 | | |