Mercurial > evolve
comparison tests/test-evolve-content-divergence.t @ 3936:537fd9a86c06 mercurial-4.3
test-compat: merge mercurial-4.4 into mercurial-4.3
| author | Pierre-Yves David <pierre-yves.david@octobus.net> |
|---|---|
| date | Fri, 03 Aug 2018 00:22:50 +0200 |
| parents | d00f0c369bc7 |
| children | e07e764c0f48 |
comparison
equal
deleted
inserted
replaced
| 3935:9af0e2b0bdd7 | 3936:537fd9a86c06 |
|---|---|
| 45 (use 'hg evolve' to update to its successor: bdeedce1f621) | 45 (use 'hg evolve' to update to its successor: bdeedce1f621) |
| 46 $ echo bar > d | 46 $ echo bar > d |
| 47 $ hg branch watwat | 47 $ hg branch watwat |
| 48 marked working directory as branch watwat | 48 marked working directory as branch watwat |
| 49 $ hg amend | 49 $ hg amend |
| 50 2 new content-divergent changesets | 50 2 new divergent changesets |
| 51 | 51 |
| 52 $ hg glog | 52 $ hg glog |
| 53 @ 6:264b04f771fb added d | 53 @ 8:264b04f771fb added d |
| 54 | () [watwat] draft | 54 | () [watwat] draft |
| 55 | o 5:bdeedce1f621 added d | 55 | o 6:bdeedce1f621 added d |
| 56 |/ () [foobar] draft | 56 |/ () [foobar] draft |
| 57 o 3:ca1b80f7960a added c | 57 o 3:ca1b80f7960a added c |
| 58 | () [default] draft | 58 | () [default] draft |
| 59 o 2:b1661037fa25 added b | 59 o 2:b1661037fa25 added b |
| 60 | () [default] draft | 60 | () [default] draft |
| 64 () [default] draft | 64 () [default] draft |
| 65 | 65 |
| 66 $ hg evolve --content-divergent --config ui.interactive=True<<EOF | 66 $ hg evolve --content-divergent --config ui.interactive=True<<EOF |
| 67 > c | 67 > c |
| 68 > EOF | 68 > EOF |
| 69 merge:[6] added d | 69 merge:[8] added d |
| 70 with: [5] added d | 70 with: [6] added d |
| 71 base: [4] added d | 71 base: [4] added d |
| 72 merging "other" content-divergent changeset 'bdeedce1f621' | 72 merging "other" divergent changeset 'bdeedce1f621' |
| 73 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 73 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 74 content divergent changesets on different branches. | 74 content divergent changesets on different branches. |
| 75 choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar? c | 75 choose branch for the resolution changeset. (a) default or (b) watwat or (c) foobar? c |
| 76 working directory is now at 0ac42f1bc15c | 76 working directory is now at 0ac42f1bc15c |
| 77 | 77 |
| 78 $ hg glog | 78 $ hg glog |
| 79 @ 7:0ac42f1bc15c added d | 79 @ 9:0ac42f1bc15c added d |
| 80 | () [foobar] draft | 80 | () [foobar] draft |
| 81 o 3:ca1b80f7960a added c | 81 o 3:ca1b80f7960a added c |
| 82 | () [default] draft | 82 | () [default] draft |
| 83 o 2:b1661037fa25 added b | 83 o 2:b1661037fa25 added b |
| 84 | () [default] draft | 84 | () [default] draft |
| 102 $ echo bar > d | 102 $ echo bar > d |
| 103 $ hg ci -Aqm "added a d with bar in it, expect some beers" | 103 $ hg ci -Aqm "added a d with bar in it, expect some beers" |
| 104 | 104 |
| 105 $ hg prune -r 0ac42f1bc15c -s . --hidden | 105 $ hg prune -r 0ac42f1bc15c -s . --hidden |
| 106 1 changesets pruned | 106 1 changesets pruned |
| 107 2 new content-divergent changesets | 107 2 new divergent changesets |
| 108 | 108 |
| 109 $ hg glog | 109 $ hg glog |
| 110 @ 9:59081c9c425a added a d with bar in it, expect some beers | 110 @ 12:59081c9c425a added a d with bar in it, expect some beers |
| 111 | () [default] draft | 111 | () [default] draft |
| 112 | o 8:f621d00f5f0e added d | 112 | o 11:f621d00f5f0e added d |
| 113 |/ () [foobar] draft | 113 |/ () [foobar] draft |
| 114 o 3:ca1b80f7960a added c | 114 o 3:ca1b80f7960a added c |
| 115 | () [default] draft | 115 | () [default] draft |
| 116 o 2:b1661037fa25 added b | 116 o 2:b1661037fa25 added b |
| 117 | () [default] draft | 117 | () [default] draft |
| 119 | () [default] draft | 119 | () [default] draft |
| 120 o 0:8fa14d15e168 added hgignore | 120 o 0:8fa14d15e168 added hgignore |
| 121 () [default] draft | 121 () [default] draft |
| 122 | 122 |
| 123 $ hg evolve --content-divergent | 123 $ hg evolve --content-divergent |
| 124 merge:[9] added a d with bar in it, expect some beers | 124 merge:[12] added a d with bar in it, expect some beers |
| 125 with: [8] added d | 125 with: [11] added d |
| 126 base: [7] added d | 126 base: [9] added d |
| 127 merging "other" content-divergent changeset 'f621d00f5f0e' | 127 merging "other" divergent changeset 'f621d00f5f0e' |
| 128 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 128 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 129 working directory is now at a9d6fd6b5e40 | 129 working directory is now at a9d6fd6b5e40 |
| 130 | 130 |
| 131 $ hg glog | 131 $ hg glog |
| 132 @ 10:a9d6fd6b5e40 added a d with bar in it, expect some beers | 132 @ 13:a9d6fd6b5e40 added a d with bar in it, expect some beers |
| 133 | () [default] draft | 133 | () [default] draft |
| 134 o 3:ca1b80f7960a added c | 134 o 3:ca1b80f7960a added c |
| 135 | () [default] draft | 135 | () [default] draft |
| 136 o 2:b1661037fa25 added b | 136 o 2:b1661037fa25 added b |
| 137 | () [default] draft | 137 | () [default] draft |
| 149 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 149 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 150 working directory parent is obsolete! (a9d6fd6b5e40) | 150 working directory parent is obsolete! (a9d6fd6b5e40) |
| 151 (use 'hg evolve' to update to its successor: b10b07a394f1) | 151 (use 'hg evolve' to update to its successor: b10b07a394f1) |
| 152 $ echo babar > d | 152 $ echo babar > d |
| 153 $ hg amend -m "foo to d" | 153 $ hg amend -m "foo to d" |
| 154 2 new content-divergent changesets | 154 2 new divergent changesets |
| 155 | 155 |
| 156 $ hg glog | 156 $ hg glog |
| 157 @ 12:0bb497fed24a foo to d | 157 @ 17:0bb497fed24a foo to d |
| 158 | () [default] draft | 158 | () [default] draft |
| 159 | o 11:b10b07a394f1 foo to d | 159 | o 15:b10b07a394f1 foo to d |
| 160 |/ () [default] draft | 160 |/ () [default] draft |
| 161 o 3:ca1b80f7960a added c | 161 o 3:ca1b80f7960a added c |
| 162 | () [default] draft | 162 | () [default] draft |
| 163 o 2:b1661037fa25 added b | 163 o 2:b1661037fa25 added b |
| 164 | () [default] draft | 164 | () [default] draft |
| 166 | () [default] draft | 166 | () [default] draft |
| 167 o 0:8fa14d15e168 added hgignore | 167 o 0:8fa14d15e168 added hgignore |
| 168 () [default] draft | 168 () [default] draft |
| 169 | 169 |
| 170 $ hg evolve --content-divergent | 170 $ hg evolve --content-divergent |
| 171 merge:[12] foo to d | 171 merge:[17] foo to d |
| 172 with: [11] foo to d | 172 with: [15] foo to d |
| 173 base: [10] added a d with bar in it, expect some beers | 173 base: [13] added a d with bar in it, expect some beers |
| 174 merging "other" content-divergent changeset 'b10b07a394f1' | 174 merging "other" divergent changeset 'b10b07a394f1' |
| 175 merging d | 175 merging d |
| 176 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 176 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 177 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 177 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 178 fix conflicts and see `hg help evolve.interrupted` | 178 fix conflicts and see `hg help evolve.interrupted` |
| 179 [1] | 179 [1] |
| 184 continue: hg evolve --continue | 184 continue: hg evolve --continue |
| 185 $ hg evolve --continue | 185 $ hg evolve --continue |
| 186 working directory is now at 11175423b5dc | 186 working directory is now at 11175423b5dc |
| 187 | 187 |
| 188 $ hg glog | 188 $ hg glog |
| 189 @ 13:11175423b5dc foo to d | 189 @ 18:11175423b5dc foo to d |
| 190 | () [default] draft | 190 | () [default] draft |
| 191 o 3:ca1b80f7960a added c | 191 o 3:ca1b80f7960a added c |
| 192 | () [default] draft | 192 | () [default] draft |
| 193 o 2:b1661037fa25 added b | 193 o 2:b1661037fa25 added b |
| 194 | () [default] draft | 194 | () [default] draft |
| 207 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 207 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 208 working directory parent is obsolete! (11175423b5dc) | 208 working directory parent is obsolete! (11175423b5dc) |
| 209 (use 'hg evolve' to update to its successor: 27f0463f169a) | 209 (use 'hg evolve' to update to its successor: 27f0463f169a) |
| 210 $ echo wat > d | 210 $ echo wat > d |
| 211 $ hg amend -m "wat to d, wat?" | 211 $ hg amend -m "wat to d, wat?" |
| 212 2 new content-divergent changesets | 212 2 new divergent changesets |
| 213 | 213 |
| 214 $ hg glog | 214 $ hg glog |
| 215 @ 15:f542037ddf31 wat to d, wat? | 215 @ 22:f542037ddf31 wat to d, wat? |
| 216 | () [default] draft | 216 | () [default] draft |
| 217 | o 14:27f0463f169a bar to d, expect beers | 217 | o 20:27f0463f169a bar to d, expect beers |
| 218 |/ () [default] draft | 218 |/ () [default] draft |
| 219 o 3:ca1b80f7960a added c | 219 o 3:ca1b80f7960a added c |
| 220 | () [default] draft | 220 | () [default] draft |
| 221 o 2:b1661037fa25 added b | 221 o 2:b1661037fa25 added b |
| 222 | () [default] draft | 222 | () [default] draft |
| 224 | () [default] draft | 224 | () [default] draft |
| 225 o 0:8fa14d15e168 added hgignore | 225 o 0:8fa14d15e168 added hgignore |
| 226 () [default] draft | 226 () [default] draft |
| 227 | 227 |
| 228 $ hg evolve --content-divergent | 228 $ hg evolve --content-divergent |
| 229 merge:[15] wat to d, wat? | 229 merge:[22] wat to d, wat? |
| 230 with: [14] bar to d, expect beers | 230 with: [20] bar to d, expect beers |
| 231 base: [13] foo to d | 231 base: [18] foo to d |
| 232 merging "other" content-divergent changeset '27f0463f169a' | 232 merging "other" divergent changeset '27f0463f169a' |
| 233 merging d | 233 merging d |
| 234 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') | 234 warning: conflicts while merging d! (edit, then use 'hg resolve --mark') |
| 235 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 235 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 236 fix conflicts and see `hg help evolve.interrupted` | 236 fix conflicts and see `hg help evolve.interrupted` |
| 237 [1] | 237 [1] |
| 265 **done showing editors text** | 265 **done showing editors text** |
| 266 | 266 |
| 267 working directory is now at 89ea3eee2d69 | 267 working directory is now at 89ea3eee2d69 |
| 268 | 268 |
| 269 $ hg glog | 269 $ hg glog |
| 270 @ 16:89ea3eee2d69 watbar to d | 270 @ 23:89ea3eee2d69 watbar to d |
| 271 | () [default] draft | 271 | () [default] draft |
| 272 o 3:ca1b80f7960a added c | 272 o 3:ca1b80f7960a added c |
| 273 | () [default] draft | 273 | () [default] draft |
| 274 o 2:b1661037fa25 added b | 274 o 2:b1661037fa25 added b |
| 275 | () [default] draft | 275 | () [default] draft |
| 305 | 305 |
| 306 $ hg up .^^ | 306 $ hg up .^^ |
| 307 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 307 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 308 $ echo bar > b | 308 $ echo bar > b |
| 309 $ hg amend | 309 $ hg amend |
| 310 2 new orphan changesets | 310 2 new unstable changesets |
| 311 | 311 |
| 312 $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True | 312 $ hg rebase -r b1661037fa25 -d 8fa14d15e168 --hidden --config experimental.evolution.allowdivergence=True --config experimental.allowdivergence=True |
| 313 rebasing 2:b1661037fa25 "added b" | 313 rebasing 2:b1661037fa25 "added b" |
| 314 2 new content-divergent changesets | 314 2 new divergent changesets |
| 315 | 315 |
| 316 $ hg glog | 316 $ hg glog |
| 317 o 6:da4b96f4a8d6 added b | 317 o 7:da4b96f4a8d6 added b |
| 318 | () [default] draft | 318 | () [default] draft |
| 319 | @ 5:7ed0642d644b added b | 319 | @ 6:7ed0642d644b added b |
| 320 | | () [default] draft | 320 | | () [default] draft |
| 321 | | o 4:c41c793e0ef1 added d | 321 | | o 4:c41c793e0ef1 added d |
| 322 | | | () [default] draft | 322 | | | () [default] draft |
| 323 | | o 3:ca1b80f7960a added c | 323 | | o 3:ca1b80f7960a added c |
| 324 | | | () [default] draft | 324 | | | () [default] draft |
| 328 |/ () [default] draft | 328 |/ () [default] draft |
| 329 o 0:8fa14d15e168 added hgignore | 329 o 0:8fa14d15e168 added hgignore |
| 330 () [default] draft | 330 () [default] draft |
| 331 | 331 |
| 332 $ hg evolve --content-divergent | 332 $ hg evolve --content-divergent |
| 333 merge:[5] added b | 333 merge:[6] added b |
| 334 with: [6] added b | 334 with: [7] added b |
| 335 base: [2] added b | 335 base: [2] added b |
| 336 rebasing "other" content-divergent changeset da4b96f4a8d6 on c7586e2a9264 | 336 rebasing "other" content-divergent changeset da4b96f4a8d6 on c7586e2a9264 |
| 337 updating to "local" side of the conflict: 7ed0642d644b | 337 updating to "local" side of the conflict: 7ed0642d644b |
| 338 merging "other" content-divergent changeset '11f849d7159f' | 338 merging "other" divergent changeset '11f849d7159f' |
| 339 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 339 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 340 working directory is now at 171614c9a791 | 340 working directory is now at 171614c9a791 |
| 341 | 341 |
| 342 $ hg glog | 342 $ hg glog |
| 343 @ 8:171614c9a791 added b | 343 @ 9:171614c9a791 added b |
| 344 | () [default] draft | 344 | () [default] draft |
| 345 | o 4:c41c793e0ef1 added d | 345 | o 4:c41c793e0ef1 added d |
| 346 | | () [default] draft | 346 | | () [default] draft |
| 347 | o 3:ca1b80f7960a added c | 347 | o 3:ca1b80f7960a added c |
| 348 | | () [default] draft | 348 | | () [default] draft |
| 370 | 370 |
| 371 Resolving orphans to get back to a normal graph | 371 Resolving orphans to get back to a normal graph |
| 372 | 372 |
| 373 $ hg evolve --all | 373 $ hg evolve --all |
| 374 move:[3] added c | 374 move:[3] added c |
| 375 atop:[8] added b | 375 atop:[9] added b |
| 376 move:[4] added d | 376 move:[4] added d |
| 377 atop:[9] added c | 377 atop:[10] added c |
| 378 working directory is now at 4ae4427ee9f8 | 378 working directory is now at 4ae4427ee9f8 |
| 379 $ hg glog | 379 $ hg glog |
| 380 @ 10:4ae4427ee9f8 added d | 380 @ 11:4ae4427ee9f8 added d |
| 381 | () [default] draft | 381 | () [default] draft |
| 382 o 9:917281f93fcb added c | 382 o 10:917281f93fcb added c |
| 383 | () [default] draft | 383 | () [default] draft |
| 384 o 8:171614c9a791 added b | 384 o 9:171614c9a791 added b |
| 385 | () [default] draft | 385 | () [default] draft |
| 386 o 1:c7586e2a9264 added a | 386 o 1:c7586e2a9264 added a |
| 387 | () [default] draft | 387 | () [default] draft |
| 388 o 0:8fa14d15e168 added hgignore | 388 o 0:8fa14d15e168 added hgignore |
| 389 () [default] draft | 389 () [default] draft |
| 393 $ hg up .^^ | 393 $ hg up .^^ |
| 394 0 files updated, 0 files merged, 2 files removed, 0 files unresolved | 394 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
| 395 $ echo x > x | 395 $ echo x > x |
| 396 $ hg ci -Aqm "added x" | 396 $ hg ci -Aqm "added x" |
| 397 $ hg glog -r . | 397 $ hg glog -r . |
| 398 @ 11:71a392c714b5 added x | 398 @ 12:71a392c714b5 added x |
| 399 | () [default] draft | 399 | () [default] draft |
| 400 ~ | 400 ~ |
| 401 | 401 |
| 402 $ echo foo > x | 402 $ echo foo > x |
| 403 $ hg branch bar | 403 $ hg branch bar |
| 407 | 407 |
| 408 $ hg up 71a392c714b5 --hidden | 408 $ hg up 71a392c714b5 --hidden |
| 409 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 409 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 410 working directory parent is obsolete! (71a392c714b5) | 410 working directory parent is obsolete! (71a392c714b5) |
| 411 (use 'hg evolve' to update to its successor: 1e1a50385a7d) | 411 (use 'hg evolve' to update to its successor: 1e1a50385a7d) |
| 412 $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True | 412 $ hg rebase -r . -d 4ae4427ee9f8 --config experimental.evolution.allowdivergence=True --config experimental.allowdivergence=True |
| 413 rebasing 11:71a392c714b5 "added x" | 413 rebasing 12:71a392c714b5 "added x" |
| 414 2 new content-divergent changesets | 414 2 new divergent changesets |
| 415 | 415 |
| 416 $ hg glog | 416 $ hg glog |
| 417 @ 13:1e4f6b3bb39b added x | 417 @ 15:1e4f6b3bb39b added x |
| 418 | () [default] draft | 418 | () [default] draft |
| 419 | o 12:1e1a50385a7d added foo to x | 419 | o 14:1e1a50385a7d added foo to x |
| 420 | | () [bar] draft | 420 | | () [bar] draft |
| 421 o | 10:4ae4427ee9f8 added d | 421 o | 11:4ae4427ee9f8 added d |
| 422 | | () [default] draft | 422 | | () [default] draft |
| 423 o | 9:917281f93fcb added c | 423 o | 10:917281f93fcb added c |
| 424 |/ () [default] draft | 424 |/ () [default] draft |
| 425 o 8:171614c9a791 added b | 425 o 9:171614c9a791 added b |
| 426 | () [default] draft | 426 | () [default] draft |
| 427 o 1:c7586e2a9264 added a | 427 o 1:c7586e2a9264 added a |
| 428 | () [default] draft | 428 | () [default] draft |
| 429 o 0:8fa14d15e168 added hgignore | 429 o 0:8fa14d15e168 added hgignore |
| 430 () [default] draft | 430 () [default] draft |
| 431 | 431 |
| 432 $ hg evolve --content-divergent | 432 $ hg evolve --content-divergent |
| 433 merge:[13] added x | 433 merge:[15] added x |
| 434 with: [12] added foo to x | 434 with: [14] added foo to x |
| 435 base: [11] added x | 435 base: [12] added x |
| 436 rebasing "other" content-divergent changeset 1e1a50385a7d on 4ae4427ee9f8 | 436 rebasing "other" content-divergent changeset 1e1a50385a7d on 4ae4427ee9f8 |
| 437 updating to "local" side of the conflict: 1e4f6b3bb39b | 437 updating to "local" side of the conflict: 1e4f6b3bb39b |
| 438 merging "other" content-divergent changeset '80cc9b1ec650' | 438 merging "other" divergent changeset '80cc9b1ec650' |
| 439 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 439 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 440 working directory is now at b006cf317e0e | 440 working directory is now at b006cf317e0e |
| 441 | 441 |
| 442 $ hg exp | 442 $ hg exp |
| 443 # HG changeset patch | 443 # HG changeset patch |
| 456 +foo | 456 +foo |
| 457 | 457 |
| 458 The above `hg exp` and the following log call demonstrates that message, content | 458 The above `hg exp` and the following log call demonstrates that message, content |
| 459 and branch change is preserved in case of relocation | 459 and branch change is preserved in case of relocation |
| 460 $ hg glog | 460 $ hg glog |
| 461 @ 15:b006cf317e0e added foo to x | 461 @ 17:b006cf317e0e added foo to x |
| 462 | () [bar] draft | 462 | () [bar] draft |
| 463 o 10:4ae4427ee9f8 added d | 463 o 11:4ae4427ee9f8 added d |
| 464 | () [default] draft | 464 | () [default] draft |
| 465 o 9:917281f93fcb added c | 465 o 10:917281f93fcb added c |
| 466 | () [default] draft | 466 | () [default] draft |
| 467 o 8:171614c9a791 added b | 467 o 9:171614c9a791 added b |
| 468 | () [default] draft | 468 | () [default] draft |
| 469 o 1:c7586e2a9264 added a | 469 o 1:c7586e2a9264 added a |
| 470 | () [default] draft | 470 | () [default] draft |
| 471 o 0:8fa14d15e168 added hgignore | 471 o 0:8fa14d15e168 added hgignore |
| 472 () [default] draft | 472 () [default] draft |
| 479 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | 479 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
| 480 | 480 |
| 481 $ echo y > y | 481 $ echo y > y |
| 482 $ hg ci -Aqm "added y" | 482 $ hg ci -Aqm "added y" |
| 483 $ hg glog -r . | 483 $ hg glog -r . |
| 484 @ 16:fc6ad2bac162 added y | 484 @ 18:fc6ad2bac162 added y |
| 485 | () [default] draft | 485 | () [default] draft |
| 486 ~ | 486 ~ |
| 487 | 487 |
| 488 $ echo bar > y | 488 $ echo bar > y |
| 489 $ hg amend | 489 $ hg amend |
| 490 | 490 |
| 491 $ hg up fc6ad2bac162 --hidden | 491 $ hg up fc6ad2bac162 --hidden |
| 492 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | 492 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 493 working directory parent is obsolete! (fc6ad2bac162) | 493 working directory parent is obsolete! (fc6ad2bac162) |
| 494 (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) | 494 (use 'hg evolve' to update to its successor: 2a9f6ccbdeba) |
| 495 $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True | 495 $ hg rebase -r . -d b006cf317e0e --config experimental.evolution.allowdivergence=True --config experimental.allowdivergence=True |
| 496 rebasing 16:fc6ad2bac162 "added y" | 496 rebasing 18:fc6ad2bac162 "added y" |
| 497 2 new content-divergent changesets | 497 2 new divergent changesets |
| 498 $ echo wat > y | 498 $ echo wat > y |
| 499 $ hg amend | 499 $ hg amend |
| 500 | 500 |
| 501 $ hg glog | 501 $ hg glog |
| 502 @ 19:b4575ed6fcfc added y | 502 @ 23:b4575ed6fcfc added y |
| 503 | () [bar] draft | 503 | () [bar] draft |
| 504 | o 17:2a9f6ccbdeba added y | 504 | o 20:2a9f6ccbdeba added y |
| 505 | | () [default] draft | 505 | | () [default] draft |
| 506 o | 15:b006cf317e0e added foo to x | 506 o | 17:b006cf317e0e added foo to x |
| 507 | | () [bar] draft | 507 | | () [bar] draft |
| 508 o | 10:4ae4427ee9f8 added d | 508 o | 11:4ae4427ee9f8 added d |
| 509 | | () [default] draft | 509 | | () [default] draft |
| 510 o | 9:917281f93fcb added c | 510 o | 10:917281f93fcb added c |
| 511 |/ () [default] draft | 511 |/ () [default] draft |
| 512 o 8:171614c9a791 added b | 512 o 9:171614c9a791 added b |
| 513 | () [default] draft | 513 | () [default] draft |
| 514 o 1:c7586e2a9264 added a | 514 o 1:c7586e2a9264 added a |
| 515 | () [default] draft | 515 | () [default] draft |
| 516 o 0:8fa14d15e168 added hgignore | 516 o 0:8fa14d15e168 added hgignore |
| 517 () [default] draft | 517 () [default] draft |
| 518 | 518 |
| 519 $ hg evolve --content-divergent | 519 $ hg evolve --content-divergent |
| 520 merge:[19] added y | 520 merge:[23] added y |
| 521 with: [17] added y | 521 with: [20] added y |
| 522 base: [16] added y | 522 base: [18] added y |
| 523 rebasing "other" content-divergent changeset 2a9f6ccbdeba on b006cf317e0e | 523 rebasing "other" content-divergent changeset 2a9f6ccbdeba on b006cf317e0e |
| 524 updating to "local" side of the conflict: b4575ed6fcfc | 524 updating to "local" side of the conflict: b4575ed6fcfc |
| 525 merging "other" content-divergent changeset '48f745db3f53' | 525 merging "other" divergent changeset '48f745db3f53' |
| 526 merging y | 526 merging y |
| 527 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') | 527 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
| 528 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 528 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 529 fix conflicts and see `hg help evolve.interrupted` | 529 fix conflicts and see `hg help evolve.interrupted` |
| 530 [1] | 530 [1] |
| 535 continue: hg evolve --continue | 535 continue: hg evolve --continue |
| 536 $ hg evolve --continue | 536 $ hg evolve --continue |
| 537 working directory is now at 7bbcf24ddecf | 537 working directory is now at 7bbcf24ddecf |
| 538 | 538 |
| 539 $ hg glog | 539 $ hg glog |
| 540 @ 21:7bbcf24ddecf added y | 540 @ 25:7bbcf24ddecf added y |
| 541 | () [bar] draft | 541 | () [bar] draft |
| 542 o 15:b006cf317e0e added foo to x | 542 o 17:b006cf317e0e added foo to x |
| 543 | () [bar] draft | 543 | () [bar] draft |
| 544 o 10:4ae4427ee9f8 added d | 544 o 11:4ae4427ee9f8 added d |
| 545 | () [default] draft | 545 | () [default] draft |
| 546 o 9:917281f93fcb added c | 546 o 10:917281f93fcb added c |
| 547 | () [default] draft | 547 | () [default] draft |
| 548 o 8:171614c9a791 added b | 548 o 9:171614c9a791 added b |
| 549 | () [default] draft | 549 | () [default] draft |
| 550 o 1:c7586e2a9264 added a | 550 o 1:c7586e2a9264 added a |
| 551 | () [default] draft | 551 | () [default] draft |
| 552 o 0:8fa14d15e168 added hgignore | 552 o 0:8fa14d15e168 added hgignore |
| 553 () [default] draft | 553 () [default] draft |
| 554 | 554 |
| 555 $ hg obslog -r . --all | 555 $ hg obslog -r . --all |
| 556 @ 7bbcf24ddecf (21) added y | 556 @ 7bbcf24ddecf (25) added y |
| 557 |\ | 557 |\ |
| 558 x | 48f745db3f53 (20) added y | 558 x | 48f745db3f53 (24) added y |
| 559 | | rewritten(branch, content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | 559 | | rewritten(branch, content) as 7bbcf24ddecf by test (Thu Jan 01 00:00:00 1970 +0000) |
| 560 | | | 560 | | |
| 561 | x b4575ed6fcfc (19) added y | 561 | x b4575ed6fcfc (23) added y |
| 562 | | rewritten(content) as 7bbcf24ddecf using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | 562 | | rewritten(content) as 7bbcf24ddecf by test (Thu Jan 01 00:00:00 1970 +0000) |
| 563 | | | 563 | | |
| 564 x | 2a9f6ccbdeba (17) added y | 564 x | 2a9f6ccbdeba (20) added y |
| 565 | | rewritten(parent) as 48f745db3f53 using evolve by test (Thu Jan 01 00:00:00 1970 +0000) | 565 | | rewritten(parent) as 48f745db3f53 by test (Thu Jan 01 00:00:00 1970 +0000) |
| 566 | | | 566 | | |
| 567 | x 96b677f01b81 (18) added y | 567 | x 96b677f01b81 (21) added y |
| 568 |/ rewritten(content) as b4575ed6fcfc using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 568 |/ rewritten(content) as b4575ed6fcfc by test (Thu Jan 01 00:00:00 1970 +0000) |
| 569 | | 569 | |
| 570 x fc6ad2bac162 (16) added y | 570 x fc6ad2bac162 (18) added y |
| 571 rewritten(content) as 2a9f6ccbdeba using amend by test (Thu Jan 01 00:00:00 1970 +0000) | 571 rewritten(content) as 2a9f6ccbdeba by test (Thu Jan 01 00:00:00 1970 +0000) |
| 572 rewritten(branch, parent) as 96b677f01b81 using rebase by test (Thu Jan 01 00:00:00 1970 +0000) | 572 rewritten(branch, parent) as 96b677f01b81 by test (Thu Jan 01 00:00:00 1970 +0000) |
| 573 | 573 |
| 574 | 574 |
| 575 checking that relocated commit is there | 575 checking that relocated commit is there |
| 576 $ hg exp 48f745db3f53 --hidden | 576 $ hg exp 48f745db3f53 --hidden |
| 577 # HG changeset patch | 577 # HG changeset patch |
| 590 | 590 |
| 591 Testing when the relocation will result in conflicts and merging wont | 591 Testing when the relocation will result in conflicts and merging wont |
| 592 ---------------------------------------------------------------------- | 592 ---------------------------------------------------------------------- |
| 593 | 593 |
| 594 $ hg glog | 594 $ hg glog |
| 595 @ 21:7bbcf24ddecf added y | 595 @ 25:7bbcf24ddecf added y |
| 596 | () [bar] draft | 596 | () [bar] draft |
| 597 o 15:b006cf317e0e added foo to x | 597 o 17:b006cf317e0e added foo to x |
| 598 | () [bar] draft | 598 | () [bar] draft |
| 599 o 10:4ae4427ee9f8 added d | 599 o 11:4ae4427ee9f8 added d |
| 600 | () [default] draft | 600 | () [default] draft |
| 601 o 9:917281f93fcb added c | 601 o 10:917281f93fcb added c |
| 602 | () [default] draft | 602 | () [default] draft |
| 603 o 8:171614c9a791 added b | 603 o 9:171614c9a791 added b |
| 604 | () [default] draft | 604 | () [default] draft |
| 605 o 1:c7586e2a9264 added a | 605 o 1:c7586e2a9264 added a |
| 606 | () [default] draft | 606 | () [default] draft |
| 607 o 0:8fa14d15e168 added hgignore | 607 o 0:8fa14d15e168 added hgignore |
| 608 () [default] draft | 608 () [default] draft |
| 611 0 files updated, 0 files merged, 4 files removed, 0 files unresolved | 611 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
| 612 | 612 |
| 613 $ echo z > z | 613 $ echo z > z |
| 614 $ hg ci -Aqm "added z" | 614 $ hg ci -Aqm "added z" |
| 615 $ hg glog -r . | 615 $ hg glog -r . |
| 616 @ 22:daf1de08f3b0 added z | 616 @ 26:daf1de08f3b0 added z |
| 617 | () [default] draft | 617 | () [default] draft |
| 618 ~ | 618 ~ |
| 619 | 619 |
| 620 $ echo foo > y | 620 $ echo foo > y |
| 621 $ hg add y | 621 $ hg add y |
| 623 | 623 |
| 624 $ hg up daf1de08f3b0 --hidden | 624 $ hg up daf1de08f3b0 --hidden |
| 625 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | 625 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
| 626 working directory parent is obsolete! (daf1de08f3b0) | 626 working directory parent is obsolete! (daf1de08f3b0) |
| 627 (use 'hg evolve' to update to its successor: 3f7a1f693080) | 627 (use 'hg evolve' to update to its successor: 3f7a1f693080) |
| 628 $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True | 628 $ hg rebase -r . -d 7bbcf24ddecf --config experimental.evolution.allowdivergence=True --config experimental.allowdivergence=True |
| 629 rebasing 22:daf1de08f3b0 "added z" | 629 rebasing 26:daf1de08f3b0 "added z" |
| 630 2 new content-divergent changesets | 630 2 new divergent changesets |
| 631 $ echo bar > z | 631 $ echo bar > z |
| 632 $ hg amend | 632 $ hg amend |
| 633 | 633 |
| 634 $ hg glog | 634 $ hg glog |
| 635 @ 25:53242575ffa9 added z | 635 @ 31:53242575ffa9 added z |
| 636 | () [bar] draft | 636 | () [bar] draft |
| 637 | o 23:3f7a1f693080 added z | 637 | o 28:3f7a1f693080 added z |
| 638 | | () [default] draft | 638 | | () [default] draft |
| 639 o | 21:7bbcf24ddecf added y | 639 o | 25:7bbcf24ddecf added y |
| 640 | | () [bar] draft | 640 | | () [bar] draft |
| 641 o | 15:b006cf317e0e added foo to x | 641 o | 17:b006cf317e0e added foo to x |
| 642 | | () [bar] draft | 642 | | () [bar] draft |
| 643 o | 10:4ae4427ee9f8 added d | 643 o | 11:4ae4427ee9f8 added d |
| 644 | | () [default] draft | 644 | | () [default] draft |
| 645 o | 9:917281f93fcb added c | 645 o | 10:917281f93fcb added c |
| 646 |/ () [default] draft | 646 |/ () [default] draft |
| 647 o 8:171614c9a791 added b | 647 o 9:171614c9a791 added b |
| 648 | () [default] draft | 648 | () [default] draft |
| 649 o 1:c7586e2a9264 added a | 649 o 1:c7586e2a9264 added a |
| 650 | () [default] draft | 650 | () [default] draft |
| 651 o 0:8fa14d15e168 added hgignore | 651 o 0:8fa14d15e168 added hgignore |
| 652 () [default] draft | 652 () [default] draft |
| 653 | 653 |
| 654 $ hg evolve --content-divergent | 654 $ hg evolve --content-divergent |
| 655 merge:[25] added z | 655 merge:[31] added z |
| 656 with: [23] added z | 656 with: [28] added z |
| 657 base: [22] added z | 657 base: [26] added z |
| 658 rebasing "other" content-divergent changeset 3f7a1f693080 on 7bbcf24ddecf | 658 rebasing "other" content-divergent changeset 3f7a1f693080 on 7bbcf24ddecf |
| 659 merging y | 659 merging y |
| 660 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') | 660 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
| 661 fix conflicts and see `hg help evolve.interrupted` | 661 fix conflicts and see `hg help evolve.interrupted` |
| 662 [1] | 662 [1] |
| 681 $ hg resolve -m | 681 $ hg resolve -m |
| 682 (no more unresolved files) | 682 (no more unresolved files) |
| 683 continue: hg evolve --continue | 683 continue: hg evolve --continue |
| 684 | 684 |
| 685 $ hg evolve --continue | 685 $ hg evolve --continue |
| 686 evolving 23:3f7a1f693080 "added z" | 686 evolving 28:3f7a1f693080 "added z" |
| 687 updating to "local" side of the conflict: 53242575ffa9 | 687 updating to "local" side of the conflict: 53242575ffa9 |
| 688 merging "other" content-divergent changeset 'cdb0643c69fc' | 688 merging "other" divergent changeset 'cdb0643c69fc' |
| 689 merging y | 689 merging y |
| 690 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') | 690 warning: conflicts while merging y! (edit, then use 'hg resolve --mark') |
| 691 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | 691 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
| 692 fix conflicts and see `hg help evolve.interrupted` | 692 fix conflicts and see `hg help evolve.interrupted` |
| 693 [1] | 693 [1] |
| 709 continue: hg evolve --continue | 709 continue: hg evolve --continue |
| 710 $ hg evolve --continue | 710 $ hg evolve --continue |
| 711 working directory is now at 6fc7d9682de6 | 711 working directory is now at 6fc7d9682de6 |
| 712 | 712 |
| 713 $ hg glog | 713 $ hg glog |
| 714 @ 27:6fc7d9682de6 added z | 714 @ 33:6fc7d9682de6 added z |
| 715 | () [bar] draft | 715 | () [bar] draft |
| 716 o 21:7bbcf24ddecf added y | 716 o 25:7bbcf24ddecf added y |
| 717 | () [bar] draft | 717 | () [bar] draft |
| 718 o 15:b006cf317e0e added foo to x | 718 o 17:b006cf317e0e added foo to x |
| 719 | () [bar] draft | 719 | () [bar] draft |
| 720 o 10:4ae4427ee9f8 added d | 720 o 11:4ae4427ee9f8 added d |
| 721 | () [default] draft | 721 | () [default] draft |
| 722 o 9:917281f93fcb added c | 722 o 10:917281f93fcb added c |
| 723 | () [default] draft | 723 | () [default] draft |
| 724 o 8:171614c9a791 added b | 724 o 9:171614c9a791 added b |
| 725 | () [default] draft | 725 | () [default] draft |
| 726 o 1:c7586e2a9264 added a | 726 o 1:c7586e2a9264 added a |
| 727 | () [default] draft | 727 | () [default] draft |
| 728 o 0:8fa14d15e168 added hgignore | 728 o 0:8fa14d15e168 added hgignore |
| 729 () [default] draft | 729 () [default] draft |
| 782 requesting all changes | 782 requesting all changes |
| 783 adding changesets | 783 adding changesets |
| 784 adding manifests | 784 adding manifests |
| 785 adding file changes | 785 adding file changes |
| 786 added 5 changesets with 5 changes to 5 files | 786 added 5 changesets with 5 changes to 5 files |
| 787 new changesets 8fa14d15e168:c41c793e0ef1 | |
| 788 (run 'hg update' to get a working copy) | 787 (run 'hg update' to get a working copy) |
| 789 $ hg glog | 788 $ hg glog |
| 790 o 4:c41c793e0ef1 added d | 789 o 4:c41c793e0ef1 added d |
| 791 | () [default] draft | 790 | () [default] draft |
| 792 o 3:ca1b80f7960a added c | 791 o 3:ca1b80f7960a added c |
| 800 | 799 |
| 801 $ hg up c7586e2a9264 | 800 $ hg up c7586e2a9264 |
| 802 2 files updated, 0 files merged, 0 files removed, 0 files unresolved | 801 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 803 $ echo bar > a | 802 $ echo bar > a |
| 804 $ hg amend -m "watbar to a" | 803 $ hg amend -m "watbar to a" |
| 805 3 new orphan changesets | 804 3 new unstable changesets |
| 806 $ echo wat > a | 805 $ echo wat > a |
| 807 $ hg amend -m "watbar to a" | 806 $ hg amend -m "watbar to a" |
| 807 $ hg evolve --all | |
| 808 move:[2] added b | |
| 809 atop:[8] watbar to a | |
| 810 move:[3] added c | |
| 811 atop:[9] added b | |
| 812 move:[4] added d | |
| 813 atop:[10] added c | |
| 814 working directory is now at 15c781f93cac | |
| 815 $ hg glog | |
| 816 @ 11:15c781f93cac added d | |
| 817 | () [default] draft | |
| 818 o 10:9e5fb1d5b955 added c | |
| 819 | () [default] draft | |
| 820 o 9:88516dccf68a added b | |
| 821 | () [default] draft | |
| 822 o 8:82b74d5dc678 watbar to a | |
| 823 | () [default] draft | |
| 824 o 0:8fa14d15e168 added hgignore | |
| 825 () [default] draft | |
| 826 | |
| 827 $ cd ../stacktest | |
| 828 $ hg up .^^^ | |
| 829 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
| 830 $ echo wat > a | |
| 831 $ hg amend -m "watbar to a" | |
| 832 3 new unstable changesets | |
| 808 $ hg evolve --all | 833 $ hg evolve --all |
| 809 move:[2] added b | 834 move:[2] added b |
| 810 atop:[6] watbar to a | 835 atop:[6] watbar to a |
| 811 move:[3] added c | 836 move:[3] added c |
| 812 atop:[7] added b | 837 atop:[7] added b |
| 813 move:[4] added d | 838 move:[4] added d |
| 814 atop:[8] added c | 839 atop:[8] added c |
| 815 working directory is now at 15c781f93cac | |
| 816 $ hg glog | |
| 817 @ 9:15c781f93cac added d | |
| 818 | () [default] draft | |
| 819 o 8:9e5fb1d5b955 added c | |
| 820 | () [default] draft | |
| 821 o 7:88516dccf68a added b | |
| 822 | () [default] draft | |
| 823 o 6:82b74d5dc678 watbar to a | |
| 824 | () [default] draft | |
| 825 o 0:8fa14d15e168 added hgignore | |
| 826 () [default] draft | |
| 827 | |
| 828 $ cd ../stacktest | |
| 829 $ hg up .^^^ | |
| 830 0 files updated, 0 files merged, 3 files removed, 0 files unresolved | |
| 831 $ echo wat > a | |
| 832 $ hg amend -m "watbar to a" | |
| 833 3 new orphan changesets | |
| 834 $ hg evolve --all | |
| 835 move:[2] added b | |
| 836 atop:[5] watbar to a | |
| 837 move:[3] added c | |
| 838 atop:[6] added b | |
| 839 move:[4] added d | |
| 840 atop:[7] added c | |
| 841 working directory is now at c72d2885eb51 | 840 working directory is now at c72d2885eb51 |
| 842 $ hg glog | 841 $ hg glog |
| 843 @ 8:c72d2885eb51 added d | 842 @ 9:c72d2885eb51 added d |
| 844 | () [default] draft | 843 | () [default] draft |
| 845 o 7:3ce4be6d8e5e added c | 844 o 8:3ce4be6d8e5e added c |
| 846 | () [default] draft | 845 | () [default] draft |
| 847 o 6:d5f148423c16 added b | 846 o 7:d5f148423c16 added b |
| 848 | () [default] draft | 847 | () [default] draft |
| 849 o 5:8e222f257bbf watbar to a | 848 o 6:8e222f257bbf watbar to a |
| 850 | () [default] draft | 849 | () [default] draft |
| 851 o 0:8fa14d15e168 added hgignore | 850 o 0:8fa14d15e168 added hgignore |
| 852 () [default] draft | 851 () [default] draft |
| 853 | 852 |
| 854 $ hg pull ../stack2 | 853 $ hg pull ../stack2 |
| 856 searching for changes | 855 searching for changes |
| 857 adding changesets | 856 adding changesets |
| 858 adding manifests | 857 adding manifests |
| 859 adding file changes | 858 adding file changes |
| 860 added 4 changesets with 0 changes to 4 files (+1 heads) | 859 added 4 changesets with 0 changes to 4 files (+1 heads) |
| 861 5 new obsolescence markers | 860 7 new obsolescence markers |
| 862 new changesets 82b74d5dc678:15c781f93cac | |
| 863 (run 'hg heads' to see heads, 'hg merge' to merge) | 861 (run 'hg heads' to see heads, 'hg merge' to merge) |
| 864 8 new content-divergent changesets | 862 8 new divergent changesets |
| 865 | 863 |
| 866 $ hg glog | 864 $ hg glog |
| 867 o 12:15c781f93cac added d | 865 o 13:15c781f93cac added d |
| 868 | () [default] draft | 866 | () [default] draft |
| 869 o 11:9e5fb1d5b955 added c | 867 o 12:9e5fb1d5b955 added c |
| 870 | () [default] draft | 868 | () [default] draft |
| 871 o 10:88516dccf68a added b | 869 o 11:88516dccf68a added b |
| 872 | () [default] draft | 870 | () [default] draft |
| 873 o 9:82b74d5dc678 watbar to a | 871 o 10:82b74d5dc678 watbar to a |
| 874 | () [default] draft | 872 | () [default] draft |
| 875 | @ 8:c72d2885eb51 added d | 873 | @ 9:c72d2885eb51 added d |
| 876 | | () [default] draft | 874 | | () [default] draft |
| 877 | o 7:3ce4be6d8e5e added c | 875 | o 8:3ce4be6d8e5e added c |
| 878 | | () [default] draft | 876 | | () [default] draft |
| 879 | o 6:d5f148423c16 added b | 877 | o 7:d5f148423c16 added b |
| 880 | | () [default] draft | 878 | | () [default] draft |
| 881 | o 5:8e222f257bbf watbar to a | 879 | o 6:8e222f257bbf watbar to a |
| 882 |/ () [default] draft | 880 |/ () [default] draft |
| 883 o 0:8fa14d15e168 added hgignore | 881 o 0:8fa14d15e168 added hgignore |
| 884 () [default] draft | 882 () [default] draft |
| 885 | 883 |
| 886 $ hg evolve --all --content-divergent | 884 $ hg evolve --all --content-divergent |
| 887 merge:[5] watbar to a | 885 merge:[6] watbar to a |
| 888 with: [9] watbar to a | 886 with: [10] watbar to a |
| 889 base: [1] added a | 887 base: [1] added a |
| 890 updating to "local" side of the conflict: 8e222f257bbf | 888 updating to "local" side of the conflict: 8e222f257bbf |
| 891 merging "other" content-divergent changeset '82b74d5dc678' | 889 merging "other" divergent changeset '82b74d5dc678' |
| 892 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 890 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 893 merge:[6] added b | 891 merge:[7] added b |
| 894 with: [10] added b | 892 with: [11] added b |
| 895 base: [2] added b | 893 base: [2] added b |
| 896 updating to "local" side of the conflict: d5f148423c16 | 894 updating to "local" side of the conflict: d5f148423c16 |
| 897 merging "other" content-divergent changeset '88516dccf68a' | 895 merging "other" divergent changeset '88516dccf68a' |
| 898 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 896 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 899 merge:[7] added c | 897 merge:[8] added c |
| 900 with: [11] added c | 898 with: [12] added c |
| 901 base: [3] added c | 899 base: [3] added c |
| 902 updating to "local" side of the conflict: 3ce4be6d8e5e | 900 updating to "local" side of the conflict: 3ce4be6d8e5e |
| 903 merging "other" content-divergent changeset '9e5fb1d5b955' | 901 merging "other" divergent changeset '9e5fb1d5b955' |
| 904 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 902 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 905 merge:[8] added d | 903 merge:[9] added d |
| 906 with: [12] added d | 904 with: [13] added d |
| 907 base: [4] added d | 905 base: [4] added d |
| 908 updating to "local" side of the conflict: c72d2885eb51 | 906 updating to "local" side of the conflict: c72d2885eb51 |
| 909 merging "other" content-divergent changeset '15c781f93cac' | 907 merging "other" divergent changeset '15c781f93cac' |
| 910 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | 908 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
| 911 working directory is now at 038fe7db3d88 | 909 working directory is now at 038fe7db3d88 |
| 912 | 910 |
| 913 $ hg glog | 911 $ hg glog |
| 914 @ 16:038fe7db3d88 added d | 912 @ 17:038fe7db3d88 added d |
| 915 | () [default] draft | 913 | () [default] draft |
| 916 o 15:b2cac10f3836 added c | 914 o 16:b2cac10f3836 added c |
| 917 | () [default] draft | 915 | () [default] draft |
| 918 o 14:eadfd9d70680 added b | 916 o 15:eadfd9d70680 added b |
| 919 | () [default] draft | 917 | () [default] draft |
| 920 o 13:f66f262fff6c watbar to a | 918 o 14:f66f262fff6c watbar to a |
| 921 | () [default] draft | 919 | () [default] draft |
| 922 o 0:8fa14d15e168 added hgignore | 920 o 0:8fa14d15e168 added hgignore |
| 923 () [default] draft | 921 () [default] draft |