Mercurial > hg
comparison tests/test-merge-changedelete.t @ 45584:4c8a93ec6908
merge: store commitinfo if these is a dc or cd conflict
delete-changed or changed-delete conflicts can either be resolved by mergetool,
if some tool is passed and using or by user choose something on prompt or user
doing some `hg revert` after choosing the file to remain conflicted.
If the user decides to keep the changed side, on commit we just reuse the parent
filenode. This is mostly fine unless we are in a distributed environment and
people are doing criss-cross merges.
Since, we don't have recursive merges or any other way of describing the end
result of the merge was an explicit choice and it should be differentiated from
it's ancestors, merge algo during criss-cross merges fails to take in account
the explicit choice made by user and end up with a what-can-be-said-wrong-merge.
The solution which we are trying to fix this is by creating a filenode on commit
instead of reusing the parent filenode. This helps differentiate between
pre-merged filenode and post-merge filenode and kind of tells about the choice
user made.
To implement creating new filenode functionality, we store info about these
files in mergestate so that we can read them on commit and force create a new
filenode.
Differential Revision: https://phab.mercurial-scm.org/D8988
| author | Pulkit Goyal <7895pulkit@gmail.com> |
|---|---|
| date | Thu, 03 Sep 2020 13:44:06 +0530 |
| parents | acbfa31cfaf2 |
| children | 64461b43a7bf |
comparison
equal
deleted
inserted
replaced
| 45583:9f14bb4d59ea | 45584:4c8a93ec6908 |
|---|---|
| 81 file: file1 (state "u") | 81 file: file1 (state "u") |
| 82 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") | 82 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") |
| 83 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | 83 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
| 84 other path: file1 (node 0000000000000000000000000000000000000000) | 84 other path: file1 (node 0000000000000000000000000000000000000000) |
| 85 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 85 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 86 extra: merge-removal-candidate = yes | |
| 86 file: file2 (state "u") | 87 file: file2 (state "u") |
| 87 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") | 88 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") |
| 88 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | 89 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
| 89 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | 90 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
| 90 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 91 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 92 extra: merge-removal-candidate = yes | |
| 91 file: file3 (state "u") | 93 file: file3 (state "u") |
| 92 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") | 94 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") |
| 93 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) | 95 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
| 94 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) | 96 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
| 95 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 97 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 146 file: file1 (state "r") | 148 file: file1 (state "r") |
| 147 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") | 149 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") |
| 148 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | 150 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
| 149 other path: file1 (node 0000000000000000000000000000000000000000) | 151 other path: file1 (node 0000000000000000000000000000000000000000) |
| 150 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 152 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 153 extra: merge-removal-candidate = yes | |
| 151 file: file2 (state "r") | 154 file: file2 (state "r") |
| 152 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") | 155 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") |
| 153 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | 156 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
| 154 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | 157 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
| 155 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 158 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 159 extra: merge-removal-candidate = yes | |
| 156 file: file3 (state "u") | 160 file: file3 (state "u") |
| 157 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") | 161 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") |
| 158 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) | 162 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
| 159 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) | 163 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
| 160 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 164 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 224 file: file1 (state "r") | 228 file: file1 (state "r") |
| 225 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") | 229 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") |
| 226 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | 230 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
| 227 other path: file1 (node 0000000000000000000000000000000000000000) | 231 other path: file1 (node 0000000000000000000000000000000000000000) |
| 228 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 232 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 233 extra: merge-removal-candidate = yes | |
| 229 file: file2 (state "r") | 234 file: file2 (state "r") |
| 230 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") | 235 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") |
| 231 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | 236 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
| 232 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | 237 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
| 233 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 238 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 239 extra: merge-removal-candidate = yes | |
| 234 file: file3 (state "u") | 240 file: file3 (state "u") |
| 235 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") | 241 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") |
| 236 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) | 242 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
| 237 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) | 243 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
| 238 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 244 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 286 file: file1 (state "r") | 292 file: file1 (state "r") |
| 287 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") | 293 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") |
| 288 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | 294 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
| 289 other path: file1 (node 0000000000000000000000000000000000000000) | 295 other path: file1 (node 0000000000000000000000000000000000000000) |
| 290 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 296 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 297 extra: merge-removal-candidate = yes | |
| 291 file: file2 (state "u") | 298 file: file2 (state "u") |
| 292 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") | 299 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") |
| 293 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | 300 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
| 294 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | 301 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
| 295 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 302 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 303 extra: merge-removal-candidate = yes | |
| 296 file: file3 (state "u") | 304 file: file3 (state "u") |
| 297 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") | 305 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") |
| 298 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) | 306 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
| 299 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) | 307 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
| 300 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 308 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 335 file: file1 (state "r") | 343 file: file1 (state "r") |
| 336 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") | 344 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") |
| 337 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | 345 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
| 338 other path: file1 (node 0000000000000000000000000000000000000000) | 346 other path: file1 (node 0000000000000000000000000000000000000000) |
| 339 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 347 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 348 extra: merge-removal-candidate = yes | |
| 340 file: file2 (state "r") | 349 file: file2 (state "r") |
| 341 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") | 350 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") |
| 342 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | 351 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
| 343 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | 352 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
| 344 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 353 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 354 extra: merge-removal-candidate = yes | |
| 345 file: file3 (state "r") | 355 file: file3 (state "r") |
| 346 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") | 356 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") |
| 347 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) | 357 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
| 348 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) | 358 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
| 349 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 359 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 380 file: file1 (state "r") | 390 file: file1 (state "r") |
| 381 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") | 391 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") |
| 382 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | 392 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
| 383 other path: file1 (node 0000000000000000000000000000000000000000) | 393 other path: file1 (node 0000000000000000000000000000000000000000) |
| 384 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 394 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 395 extra: merge-removal-candidate = yes | |
| 385 file: file2 (state "r") | 396 file: file2 (state "r") |
| 386 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") | 397 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") |
| 387 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | 398 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
| 388 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | 399 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
| 389 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 400 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 401 extra: merge-removal-candidate = yes | |
| 390 file: file3 (state "r") | 402 file: file3 (state "r") |
| 391 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") | 403 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") |
| 392 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) | 404 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
| 393 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) | 405 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
| 394 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 406 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 426 file: file1 (state "u") | 438 file: file1 (state "u") |
| 427 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") | 439 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") |
| 428 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | 440 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
| 429 other path: file1 (node 0000000000000000000000000000000000000000) | 441 other path: file1 (node 0000000000000000000000000000000000000000) |
| 430 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 442 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 443 extra: merge-removal-candidate = yes | |
| 431 file: file2 (state "u") | 444 file: file2 (state "u") |
| 432 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") | 445 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") |
| 433 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | 446 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
| 434 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | 447 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
| 435 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 448 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 449 extra: merge-removal-candidate = yes | |
| 436 file: file3 (state "u") | 450 file: file3 (state "u") |
| 437 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") | 451 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") |
| 438 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) | 452 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
| 439 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) | 453 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
| 440 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 454 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 483 file: file1 (state "u") | 497 file: file1 (state "u") |
| 484 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") | 498 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") |
| 485 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | 499 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
| 486 other path: file1 (node 0000000000000000000000000000000000000000) | 500 other path: file1 (node 0000000000000000000000000000000000000000) |
| 487 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 501 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 502 extra: merge-removal-candidate = yes | |
| 488 file: file2 (state "u") | 503 file: file2 (state "u") |
| 489 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") | 504 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") |
| 490 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | 505 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
| 491 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | 506 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
| 492 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 507 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 508 extra: merge-removal-candidate = yes | |
| 493 file: file3 (state "u") | 509 file: file3 (state "u") |
| 494 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") | 510 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") |
| 495 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) | 511 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
| 496 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) | 512 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
| 497 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 513 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 542 file: file1 (state "u") | 558 file: file1 (state "u") |
| 543 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") | 559 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") |
| 544 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | 560 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
| 545 other path: file1 (node 0000000000000000000000000000000000000000) | 561 other path: file1 (node 0000000000000000000000000000000000000000) |
| 546 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 562 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 563 extra: merge-removal-candidate = yes | |
| 547 file: file2 (state "u") | 564 file: file2 (state "u") |
| 548 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") | 565 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") |
| 549 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | 566 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
| 550 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | 567 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
| 551 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 568 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 569 extra: merge-removal-candidate = yes | |
| 552 file: file3 (state "u") | 570 file: file3 (state "u") |
| 553 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") | 571 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") |
| 554 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) | 572 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
| 555 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) | 573 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
| 556 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 574 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 598 file: file1 (state "u") | 616 file: file1 (state "u") |
| 599 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") | 617 local path: file1 (hash 60b27f004e454aca81b0480209cce5081ec52390, flags "") |
| 600 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) | 618 ancestor path: file1 (node b8e02f6433738021a065f94175c7cd23db5f05be) |
| 601 other path: file1 (node 0000000000000000000000000000000000000000) | 619 other path: file1 (node 0000000000000000000000000000000000000000) |
| 602 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 620 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 621 extra: merge-removal-candidate = yes | |
| 603 file: file2 (state "u") | 622 file: file2 (state "u") |
| 604 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") | 623 local path: file2 (hash 0000000000000000000000000000000000000000, flags "") |
| 605 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) | 624 ancestor path: file2 (node 5d9299349fc01ddd25d0070d149b124d8f10411e) |
| 606 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) | 625 other path: file2 (node e7c1328648519852e723de86c0c0525acd779257) |
| 607 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 626 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |
| 627 extra: merge-removal-candidate = yes | |
| 608 file: file3 (state "u") | 628 file: file3 (state "u") |
| 609 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") | 629 local path: file3 (hash d5b0a58bc47161b1b8a831084b366f757c4f0b11, flags "") |
| 610 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) | 630 ancestor path: file3 (node 2661d26c649684b482d10f91960cc3db683c38b4) |
| 611 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) | 631 other path: file3 (node a2644c43e210356772c7772a8674544a62e06beb) |
| 612 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff | 632 extra: ancestorlinknode = ab57bf49aa276a22d35a473592d4c34b5abc3eff |