Mercurial > evolve
comparison tests/test-evolve-topic.t @ 4363:a2fdbece7ce1 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Tue, 22 Jan 2019 12:57:25 -0500 |
| parents | d5a2cc19903f e268f7fd7839 |
| children | f54bb6eaf5e6 |
comparison
equal
deleted
inserted
replaced
| 4362:8bd60e09dfb4 | 4363:a2fdbece7ce1 |
|---|---|
| 87 s0^ add bbb (base) | 87 s0^ add bbb (base) |
| 88 $ hg up 'desc(ddd)' | 88 $ hg up 'desc(ddd)' |
| 89 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 89 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 90 $ echo ddd >> ddd | 90 $ echo ddd >> ddd |
| 91 $ hg amend | 91 $ hg amend |
| 92 6 new orphan changesets | |
| 93 $ hg up 'desc(fff)' | 92 $ hg up 'desc(fff)' |
| 94 3 files updated, 0 files merged, 0 files removed, 0 files unresolved | 93 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 95 $ echo fff >> fff | 94 $ echo fff >> fff |
| 96 $ hg amend | 95 $ hg amend |
| 97 | 96 |
| 98 $ hg log -G | 97 $ hg log -G |
| 99 @ 11 - {foo} e104f49bab28 add fff (draft) | 98 @ 11 - {foo} e104f49bab28 add fff (draft) |
| 100 | | 99 | |
| 101 | o 10 - {foo} d9cacd156ffc add ddd (draft) | 100 | o 10 - {foo} d9cacd156ffc add ddd (draft) |
| 102 | | | 101 | | |
| 103 | | * 9 - {bar} 1d964213b023 add jjj (draft) | 102 | | o 9 - {bar} 1d964213b023 add jjj (draft) |
| 104 | | | | 103 | | | |
| 105 | | * 8 - {bar} fcab990f3261 add iii (draft) | 104 | | o 8 - {bar} fcab990f3261 add iii (draft) |
| 106 | | | | 105 | | | |
| 107 | | * 7 - {bar} b0c2554835ac add hhh (draft) | 106 | | o 7 - {bar} b0c2554835ac add hhh (draft) |
| 108 | | | | 107 | | | |
| 109 | | * 6 - {bar} c748293f1c1a add ggg (draft) | 108 | | o 6 - {bar} c748293f1c1a add ggg (draft) |
| 110 | | | | 109 | | | |
| 111 +---x 5 - {foo} 6a6b7365c751 add fff (draft) | 110 +---x 5 - {foo} 6a6b7365c751 add fff (draft) |
| 112 | | | 111 | | |
| 113 * | 4 - {foo} 3969ab847d9c add eee (draft) | 112 o | 4 - {foo} 3969ab847d9c add eee (draft) |
| 114 | | | 113 | | |
| 115 x | 3 - {foo} 4e3a154f38c7 add ddd (draft) | 114 x | 3 - {foo} 4e3a154f38c7 add ddd (draft) |
| 116 |/ | 115 |/ |
| 117 o 2 - {foo} cced9bac76e3 add ccc (draft) | 116 o 2 - {foo} cced9bac76e3 add ccc (draft) |
| 118 | | 117 | |
| 142 | | 141 | |
| 143 o 12 - {foo} 42b49017ff90 add eee (draft) | 142 o 12 - {foo} 42b49017ff90 add eee (draft) |
| 144 | | 143 | |
| 145 o 10 - {foo} d9cacd156ffc add ddd (draft) | 144 o 10 - {foo} d9cacd156ffc add ddd (draft) |
| 146 | | 145 | |
| 147 | * 9 - {bar} 1d964213b023 add jjj (draft) | 146 | o 9 - {bar} 1d964213b023 add jjj (draft) |
| 148 | | | 147 | | |
| 149 | * 8 - {bar} fcab990f3261 add iii (draft) | 148 | o 8 - {bar} fcab990f3261 add iii (draft) |
| 150 | | | 149 | | |
| 151 | * 7 - {bar} b0c2554835ac add hhh (draft) | 150 | o 7 - {bar} b0c2554835ac add hhh (draft) |
| 152 | | | 151 | | |
| 153 | * 6 - {bar} c748293f1c1a add ggg (draft) | 152 | o 6 - {bar} c748293f1c1a add ggg (draft) |
| 154 | | | 153 | | |
| 155 | x 5 - {foo} 6a6b7365c751 add fff (draft) | 154 | x 5 - {foo} 6a6b7365c751 add fff (draft) |
| 156 | | | 155 | | |
| 157 | x 4 - {foo} 3969ab847d9c add eee (draft) | 156 | x 4 - {foo} 3969ab847d9c add eee (draft) |
| 158 | | | 157 | | |
| 254 o 1 - {} a4dbed0837ea add bbb (draft) | 253 o 1 - {} a4dbed0837ea add bbb (draft) |
| 255 | | 254 | |
| 256 o 0 - {} 199cc73e9a0b add aaa (draft) | 255 o 0 - {} 199cc73e9a0b add aaa (draft) |
| 257 | 256 |
| 258 $ hg topic -r 070c5573d8f9 bar | 257 $ hg topic -r 070c5573d8f9 bar |
| 259 4 new orphan changesets | |
| 260 changed topic on 1 changesets to "bar" | 258 changed topic on 1 changesets to "bar" |
| 261 $ hg up 16d6f664b17c | 259 $ hg up 16d6f664b17c |
| 262 switching to topic bar | 260 switching to topic bar |
| 263 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 261 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 264 | 262 |
| 280 ------------------------------------------------------------------------------ | 278 ------------------------------------------------------------------------------ |
| 281 | 279 |
| 282 $ hg log --graph | 280 $ hg log --graph |
| 283 @ 18 - {bar} 793eb6370b2d add fff (draft) | 281 @ 18 - {bar} 793eb6370b2d add fff (draft) |
| 284 | | 282 | |
| 285 | * 17 - {bar} 9bf430c106b7 add jjj (draft) | 283 | o 17 - {bar} 9bf430c106b7 add jjj (draft) |
| 286 | | | 284 | | |
| 287 | * 16 - {bar} d2dc89c57700 add iii (draft) | 285 | o 16 - {bar} d2dc89c57700 add iii (draft) |
| 288 | | | 286 | | |
| 289 | * 15 - {bar} 20bc4d02aa62 add hhh (draft) | 287 | o 15 - {bar} 20bc4d02aa62 add hhh (draft) |
| 290 | | | 288 | | |
| 291 | * 14 - {bar} 16d6f664b17c add ggg (draft) | 289 | o 14 - {bar} 16d6f664b17c add ggg (draft) |
| 292 | | | 290 | | |
| 293 | x 13 - {foo} 070c5573d8f9 add fff (draft) | 291 | x 13 - {foo} 070c5573d8f9 add fff (draft) |
| 294 |/ | 292 |/ |
| 295 o 12 - {foo} 42b49017ff90 add eee (draft) | 293 o 12 - {foo} 42b49017ff90 add eee (draft) |
| 296 | | 294 | |
| 316 $ hg up 20bc4d02aa62 | 314 $ hg up 20bc4d02aa62 |
| 317 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 315 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 318 working directory parent is obsolete! (20bc4d02aa62) | 316 working directory parent is obsolete! (20bc4d02aa62) |
| 319 (use 'hg evolve' to update to its successor: d834582d9ee3) | 317 (use 'hg evolve' to update to its successor: d834582d9ee3) |
| 320 $ hg log -Gr 14:: | 318 $ hg log -Gr 14:: |
| 321 * 19 - {bar} d834582d9ee3 add hhh (draft) | 319 o 19 - {bar} d834582d9ee3 add hhh (draft) |
| 322 | | 320 | |
| 323 | * 17 - {bar} 9bf430c106b7 add jjj (draft) | 321 | o 17 - {bar} 9bf430c106b7 add jjj (draft) |
| 324 | | | 322 | | |
| 325 | * 16 - {bar} d2dc89c57700 add iii (draft) | 323 | o 16 - {bar} d2dc89c57700 add iii (draft) |
| 326 | | | 324 | | |
| 327 | @ 15 - {bar} 20bc4d02aa62 add hhh (draft) | 325 | @ 15 - {bar} 20bc4d02aa62 add hhh (draft) |
| 328 |/ | 326 |/ |
| 329 * 14 - {bar} 16d6f664b17c add ggg (draft) | 327 o 14 - {bar} 16d6f664b17c add ggg (draft) |
| 330 | | 328 | |
| 331 ~ | 329 ~ |
| 332 | 330 |
| 333 $ hg prev | 331 $ hg prev |
| 334 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 332 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 | 335 When the current topic and successors topic are same, but obsolete cset has |
| 338 different topic | 336 different topic |
| 339 | 337 |
| 340 $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase= | 338 $ hg rebase -s d2dc89c57700 -d d834582d9ee3 --config extensions.rebase= |
| 341 rebasing 16:d2dc89c57700 "add iii" (bar) | 339 rebasing 16:d2dc89c57700 "add iii" (bar) |
| 342 1 new orphan changesets | |
| 343 rebasing 17:9bf430c106b7 "add jjj" (bar) | 340 rebasing 17:9bf430c106b7 "add jjj" (bar) |
| 344 1 new orphan changesets | |
| 345 $ hg log -Gr 42b49017ff90:: | 341 $ hg log -Gr 42b49017ff90:: |
| 346 * 21 - {bar} 7542e76aba2c add jjj (draft) | 342 o 21 - {bar} 7542e76aba2c add jjj (draft) |
| 347 | | 343 | |
| 348 * 20 - {bar} 7858bd7e9906 add iii (draft) | 344 o 20 - {bar} 7858bd7e9906 add iii (draft) |
| 349 | | 345 | |
| 350 * 19 - {bar} d834582d9ee3 add hhh (draft) | 346 o 19 - {bar} d834582d9ee3 add hhh (draft) |
| 351 | | 347 | |
| 352 | o 18 - {bar} 793eb6370b2d add fff (draft) | 348 | o 18 - {bar} 793eb6370b2d add fff (draft) |
| 353 | | | 349 | | |
| 354 @ | 14 - {bar} 16d6f664b17c add ggg (draft) | 350 @ | 14 - {bar} 16d6f664b17c add ggg (draft) |
| 355 | | | 351 | | |
| 397 $ hg up 18 | 393 $ hg up 18 |
| 398 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | 394 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
| 399 $ echo "changes in hhh" > hhh | 395 $ echo "changes in hhh" > hhh |
| 400 $ hg add hhh | 396 $ hg add hhh |
| 401 $ hg ci --amend | 397 $ hg ci --amend |
| 402 4 new orphan changesets | |
| 403 $ hg log -G | 398 $ hg log -G |
| 404 @ 26 - {bar} 2c295936ac04 add fff (draft) | 399 @ 26 - {bar} 2c295936ac04 add fff (draft) |
| 405 | | 400 | |
| 406 | * 25 - {bar} 38a82cbb794a add jjj (draft) | 401 | o 25 - {bar} 38a82cbb794a add jjj (draft) |
| 407 | | | 402 | | |
| 408 | * 24 - {bar} 4a44eba0fdb3 add iii (draft) | 403 | o 24 - {bar} 4a44eba0fdb3 add iii (draft) |
| 409 | | | 404 | | |
| 410 | * 23 - {bar} 7acd9ea5d677 add hhh (draft) | 405 | o 23 - {bar} 7acd9ea5d677 add hhh (draft) |
| 411 | | | 406 | | |
| 412 | * 22 - {bar} 735c7bd8f133 add ggg (draft) | 407 | o 22 - {bar} 735c7bd8f133 add ggg (draft) |
| 413 | | | 408 | | |
| 414 | x 18 - {bar} 793eb6370b2d add fff (draft) | 409 | x 18 - {bar} 793eb6370b2d add fff (draft) |
| 415 |/ | 410 |/ |
| 416 o 12 - {foo} 42b49017ff90 add eee (draft) | 411 o 12 - {foo} 42b49017ff90 add eee (draft) |
| 417 | | 412 | |