Mercurial > evolve
comparison tests/test-evolve-content-divergent-relocation.t @ 4516:f54bb6eaf5e6 mercurial-4.4
test-compat: merge mercurial-4.5 into mercurial-4.4
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Thu, 11 Apr 2019 22:44:53 +0200 |
| parents | d70db7e455dc |
| children | 79bc0f1a832e |
comparison
equal
deleted
inserted
replaced
| 4514:ef1c322c389d | 4516:f54bb6eaf5e6 |
|---|---|
| 39 | 39 |
| 40 $ hg up .^^ | 40 $ hg up .^^ |
| 41 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 41 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 42 $ echo bar > b | 42 $ echo bar > b |
| 43 $ hg amend | 43 $ hg amend |
| 44 2 new orphan changesets | |
| 45 | 44 |
| 46 $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True | 45 $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True |
| 47 rebasing 2:b1661037fa25 "added b" | 46 rebasing 2:b1661037fa25 "added b" |
| 48 2 new content-divergent changesets | 47 |
| 49 | 48 $ hg glog |
| 50 $ hg glog | 49 o 6:da4b96f4a8d6 added b |
| 51 * 6:da4b96f4a8d6 added b | |
| 52 | () [default] draft | 50 | () [default] draft |
| 53 | @ 5:7ed0642d644b added b | 51 | @ 5:7ed0642d644b added b |
| 54 | | () [default] draft | 52 | | () [default] draft |
| 55 | | * 4:c41c793e0ef1 added d | 53 | | o 4:c41c793e0ef1 added d |
| 56 | | | () [default] draft | 54 | | | () [default] draft |
| 57 | | * 3:ca1b80f7960a added c | 55 | | o 3:ca1b80f7960a added c |
| 58 | | | () [default] draft | 56 | | | () [default] draft |
| 59 | | x 2:b1661037fa25 added b | 57 | | x 2:b1661037fa25 added b |
| 60 | |/ () [default] draft | 58 | |/ () [default] draft |
| 61 | o 1:c7586e2a9264 added a | 59 | o 1:c7586e2a9264 added a |
| 62 |/ () [default] draft | 60 |/ () [default] draft |
| 74 working directory is now at 171614c9a791 | 72 working directory is now at 171614c9a791 |
| 75 | 73 |
| 76 $ hg glog | 74 $ hg glog |
| 77 @ 8:171614c9a791 added b | 75 @ 8:171614c9a791 added b |
| 78 | () [default] draft | 76 | () [default] draft |
| 79 | * 4:c41c793e0ef1 added d | 77 | o 4:c41c793e0ef1 added d |
| 80 | | () [default] draft | 78 | | () [default] draft |
| 81 | * 3:ca1b80f7960a added c | 79 | o 3:ca1b80f7960a added c |
| 82 | | () [default] draft | 80 | | () [default] draft |
| 83 | x 2:b1661037fa25 added b | 81 | x 2:b1661037fa25 added b |
| 84 |/ () [default] draft | 82 |/ () [default] draft |
| 85 o 1:c7586e2a9264 added a | 83 o 1:c7586e2a9264 added a |
| 86 | () [default] draft | 84 | () [default] draft |
| 137 marked working directory as branch bar | 135 marked working directory as branch bar |
| 138 (branches are permanent and global, did you want a bookmark?) | 136 (branches are permanent and global, did you want a bookmark?) |
| 139 $ hg amend -m "added foo to x" | 137 $ hg amend -m "added foo to x" |
| 140 | 138 |
| 141 $ hg up 71a392c714b5 --hidden | 139 $ hg up 71a392c714b5 --hidden |
| 142 updating to a hidden changeset 71a392c714b5 | |
| 143 (hidden revision '71a392c714b5' was rewritten as: 1e1a50385a7d) | |
| 144 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 140 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 145 working directory parent is obsolete! (71a392c714b5) | 141 working directory parent is obsolete! (71a392c714b5) |
| 146 (use 'hg evolve' to update to its successor: 1e1a50385a7d) | 142 (use 'hg evolve' to update to its successor: 1e1a50385a7d) |
| 147 $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True | 143 $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True |
| 148 rebasing 11:71a392c714b5 "added x" | 144 rebasing 11:71a392c714b5 "added x" |
| 149 2 new content-divergent changesets | |
| 150 | 145 |
| 151 $ hg glog | 146 $ hg glog |
| 152 @ 13:1e4f6b3bb39b added x | 147 @ 13:1e4f6b3bb39b added x |
| 153 | () [default] draft | 148 | () [default] draft |
| 154 | * 12:1e1a50385a7d added foo to x | 149 | o 12:1e1a50385a7d added foo to x |
| 155 | | () [bar] draft | 150 | | () [bar] draft |
| 156 o | 10:4ae4427ee9f8 added d | 151 o | 10:4ae4427ee9f8 added d |
| 157 | | () [default] draft | 152 | | () [default] draft |
| 158 o | 9:917281f93fcb added c | 153 o | 9:917281f93fcb added c |
| 159 |/ () [default] draft | 154 |/ () [default] draft |
| 222 | 217 |
| 223 $ echo bar > y | 218 $ echo bar > y |
| 224 $ hg amend | 219 $ hg amend |
| 225 | 220 |
| 226 $ hg up fc6ad2bac162 --hidden | 221 $ hg up fc6ad2bac162 --hidden |
| 227 updating to a hidden changeset fc6ad2bac162 | |
| 228 (hidden revision 'fc6ad2bac162' was rewritten as: 2a9f6ccbdeba) | |
| 229 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 222 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 230 working directory parent is obsolete! (fc6ad2bac162) | 223 working directory parent is obsolete! (fc6ad2bac162) |
| 231 (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) | 224 (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) |
| 232 $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True | 225 $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True |
| 233 rebasing 16:fc6ad2bac162 "added y" | 226 rebasing 16:fc6ad2bac162 "added y" |
| 234 2 new content-divergent changesets | |
| 235 $ echo wat > y | 227 $ echo wat > y |
| 236 $ hg amend | 228 $ hg amend |
| 237 | 229 |
| 238 $ hg glog | 230 $ hg glog |
| 239 @ 19:b4575ed6fcfc added y | 231 @ 19:b4575ed6fcfc added y |
| 240 | () [bar] draft | 232 | () [bar] draft |
| 241 | * 17:2a9f6ccbdeba added y | 233 | o 17:2a9f6ccbdeba added y |
| 242 | | () [default] draft | 234 | | () [default] draft |
| 243 o | 15:b006cf317e0e added foo to x | 235 o | 15:b006cf317e0e added foo to x |
| 244 | | () [bar] draft | 236 | | () [bar] draft |
| 245 o | 10:4ae4427ee9f8 added d | 237 o | 10:4ae4427ee9f8 added d |
| 246 | | () [default] draft | 238 | | () [default] draft |
| 357 $ echo foo > y | 349 $ echo foo > y |
| 358 $ hg add y | 350 $ hg add y |
| 359 $ hg amend | 351 $ hg amend |
| 360 | 352 |
| 361 $ hg up daf1de08f3b0 --hidden | 353 $ hg up daf1de08f3b0 --hidden |
| 362 updating to a hidden changeset daf1de08f3b0 | |
| 363 (hidden revision 'daf1de08f3b0' was rewritten as: 3f7a1f693080) | |
| 364 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 354 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 365 working directory parent is obsolete! (daf1de08f3b0) | 355 working directory parent is obsolete! (daf1de08f3b0) |
| 366 (use 'hg evolve' to update to its successor: 3f7a1f693080) | 356 (use 'hg evolve' to update to its successor: 3f7a1f693080) |
| 367 $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True | 357 $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True |
| 368 rebasing 22:daf1de08f3b0 "added z" | 358 rebasing 22:daf1de08f3b0 "added z" |
| 369 2 new content-divergent changesets | |
| 370 $ echo bar > z | 359 $ echo bar > z |
| 371 $ hg amend | 360 $ hg amend |
| 372 | 361 |
| 373 $ hg glog | 362 $ hg glog |
| 374 @ 25:53242575ffa9 added z | 363 @ 25:53242575ffa9 added z |
| 375 | () [bar] draft | 364 | () [bar] draft |
| 376 | * 23:3f7a1f693080 added z | 365 | o 23:3f7a1f693080 added z |
| 377 | | () [default] draft | 366 | | () [default] draft |
| 378 o | 21:7bbcf24ddecf added y | 367 o | 21:7bbcf24ddecf added y |
| 379 | | () [bar] draft | 368 | | () [bar] draft |
| 380 o | 15:b006cf317e0e added foo to x | 369 o | 15:b006cf317e0e added foo to x |
| 381 | | () [bar] draft | 370 | | () [bar] draft |