Mercurial > evolve
comparison tests/test-evolve-topic.t @ 3930:d00f0c369bc7 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 02 Aug 2018 02:47:44 +0200 |
| parents | d5adce52cef4 1bc4b0807c37 |
| children | 537fd9a86c06 f9a850018daa |
comparison
equal
deleted
inserted
replaced
| 3929:e709e3817d7e | 3930:d00f0c369bc7 |
|---|---|
| 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 | |
| 134 | | 134 | |
| 135 o 12 - {foo} 42b49017ff90 add eee (draft) | 135 o 12 - {foo} 42b49017ff90 add eee (draft) |
| 136 | | 136 | |
| 137 o 10 - {foo} d9cacd156ffc add ddd (draft) | 137 o 10 - {foo} d9cacd156ffc add ddd (draft) |
| 138 | | 138 | |
| 139 | * 9 - {bar} 1d964213b023 add jjj (draft) | 139 | o 9 - {bar} 1d964213b023 add jjj (draft) |
| 140 | | | 140 | | |
| 141 | * 8 - {bar} fcab990f3261 add iii (draft) | 141 | o 8 - {bar} fcab990f3261 add iii (draft) |
| 142 | | | 142 | | |
| 143 | * 7 - {bar} b0c2554835ac add hhh (draft) | 143 | o 7 - {bar} b0c2554835ac add hhh (draft) |
| 144 | | | 144 | | |
| 145 | * 6 - {bar} c748293f1c1a add ggg (draft) | 145 | o 6 - {bar} c748293f1c1a add ggg (draft) |
| 146 | | | 146 | | |
| 147 | x 5 - {foo} 6a6b7365c751 add fff (draft) | 147 | x 5 - {foo} 6a6b7365c751 add fff (draft) |
| 148 | | | 148 | | |
| 149 | x 4 - {foo} 3969ab847d9c add eee (draft) | 149 | x 4 - {foo} 3969ab847d9c add eee (draft) |
| 150 | | | 150 | | |
| 249 o 1 - {} a4dbed0837ea add bbb (draft) | 249 o 1 - {} a4dbed0837ea add bbb (draft) |
| 250 | | 250 | |
| 251 o 0 - {} 199cc73e9a0b add aaa (draft) | 251 o 0 - {} 199cc73e9a0b add aaa (draft) |
| 252 | 252 |
| 253 $ hg topic -r 070c5573d8f9 bar | 253 $ hg topic -r 070c5573d8f9 bar |
| 254 4 new orphan changesets | |
| 255 changed topic on 1 changes | 254 changed topic on 1 changes |
| 256 $ hg up 16d6f664b17c | 255 $ hg up 16d6f664b17c |
| 257 switching to topic bar | 256 switching to topic bar |
| 258 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 257 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 259 | 258 |
| 275 ------------------------------------------------------------------------------ | 274 ------------------------------------------------------------------------------ |
| 276 | 275 |
| 277 $ hg log --graph | 276 $ hg log --graph |
| 278 @ 18 - {bar} 793eb6370b2d add fff (draft) | 277 @ 18 - {bar} 793eb6370b2d add fff (draft) |
| 279 | | 278 | |
| 280 | * 17 - {bar} 9bf430c106b7 add jjj (draft) | 279 | o 17 - {bar} 9bf430c106b7 add jjj (draft) |
| 281 | | | 280 | | |
| 282 | * 16 - {bar} d2dc89c57700 add iii (draft) | 281 | o 16 - {bar} d2dc89c57700 add iii (draft) |
| 283 | | | 282 | | |
| 284 | * 15 - {bar} 20bc4d02aa62 add hhh (draft) | 283 | o 15 - {bar} 20bc4d02aa62 add hhh (draft) |
| 285 | | | 284 | | |
| 286 | * 14 - {bar} 16d6f664b17c add ggg (draft) | 285 | o 14 - {bar} 16d6f664b17c add ggg (draft) |
| 287 | | | 286 | | |
| 288 | x 13 - {foo} 070c5573d8f9 add fff (draft) | 287 | x 13 - {foo} 070c5573d8f9 add fff (draft) |
| 289 |/ | 288 |/ |
| 290 o 12 - {foo} 42b49017ff90 add eee (draft) | 289 o 12 - {foo} 42b49017ff90 add eee (draft) |
| 291 | | 290 | |
| 311 $ hg up 20bc4d02aa62 | 310 $ hg up 20bc4d02aa62 |
| 312 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 311 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 313 working directory parent is obsolete! (20bc4d02aa62) | 312 working directory parent is obsolete! (20bc4d02aa62) |
| 314 (use 'hg evolve' to update to its successor: d834582d9ee3) | 313 (use 'hg evolve' to update to its successor: d834582d9ee3) |
| 315 $ hg log -Gr 14:: | 314 $ hg log -Gr 14:: |
| 316 * 19 - {bar} d834582d9ee3 add hhh (draft) | 315 o 19 - {bar} d834582d9ee3 add hhh (draft) |
| 317 | | 316 | |
| 318 | * 17 - {bar} 9bf430c106b7 add jjj (draft) | 317 | o 17 - {bar} 9bf430c106b7 add jjj (draft) |
| 319 | | | 318 | | |
| 320 | * 16 - {bar} d2dc89c57700 add iii (draft) | 319 | o 16 - {bar} d2dc89c57700 add iii (draft) |
| 321 | | | 320 | | |
| 322 | @ 15 - {bar} 20bc4d02aa62 add hhh (draft) | 321 | @ 15 - {bar} 20bc4d02aa62 add hhh (draft) |
| 323 |/ | 322 |/ |
| 324 * 14 - {bar} 16d6f664b17c add ggg (draft) | 323 o 14 - {bar} 16d6f664b17c add ggg (draft) |
| 325 | | 324 | |
| 326 ~ | 325 ~ |
| 327 | 326 |
| 328 $ hg prev | 327 $ hg prev |
| 329 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 328 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 332 When the current topic and successors topic are same, but obsolete cset has | 331 When the current topic and successors topic are same, but obsolete cset has |
| 333 different topic | 332 different topic |
| 334 | 333 |
| 335 $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase= | 334 $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase= |
| 336 rebasing 16:d2dc89c57700 "add iii" (bar) | 335 rebasing 16:d2dc89c57700 "add iii" (bar) |
| 337 1 new orphan changesets | |
| 338 rebasing 17:9bf430c106b7 "add jjj" (bar) | 336 rebasing 17:9bf430c106b7 "add jjj" (bar) |
| 339 1 new orphan changesets | |
| 340 $ hg log -Gr 42b49017ff90:: | 337 $ hg log -Gr 42b49017ff90:: |
| 341 * 21 - {bar} 7542e76aba2c add jjj (draft) | 338 o 21 - {bar} 7542e76aba2c add jjj (draft) |
| 342 | | 339 | |
| 343 * 20 - {bar} 7858bd7e9906 add iii (draft) | 340 o 20 - {bar} 7858bd7e9906 add iii (draft) |
| 344 | | 341 | |
| 345 * 19 - {bar} d834582d9ee3 add hhh (draft) | 342 o 19 - {bar} d834582d9ee3 add hhh (draft) |
| 346 | | 343 | |
| 347 | o 18 - {bar} 793eb6370b2d add fff (draft) | 344 | o 18 - {bar} 793eb6370b2d add fff (draft) |
| 348 | | | 345 | | |
| 349 @ | 14 - {bar} 16d6f664b17c add ggg (draft) | 346 @ | 14 - {bar} 16d6f664b17c add ggg (draft) |
| 350 | | | 347 | | |