Show More
@@ -326,8 +326,8 b' def _process_merge(p1_ctx, p2_ctx, ctx):' | |||||
326 | │ (None, Some) │ OR │ ø │🄼 Added │OR 🅀 Salvaged │ |
|
326 | │ (None, Some) │ OR │ ø │🄼 Added │OR 🅀 Salvaged │ | |
327 | │ │🄹 Salvaged[2]│ │ (copied?) │ (copied?) │ |
|
327 | │ │🄹 Salvaged[2]│ │ (copied?) │ (copied?) │ | |
328 | ├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤ |
|
328 | ├──────────────┼──────────────┼──────────────┼──────────────┼──────────────┤ | |
329 |
│ │ │ │ 🄾 Touched │ |
|
329 | │ │ │ │ 🄾 Touched │ 🄿 Merged │ | |
330 |
│ (Some, Some) │🄺 No Changes │ ø │OR 🅁 Salvaged │ |
|
330 | │ (Some, Some) │🄺 No Changes │ ø │OR 🅁 Salvaged │OR 🅂 Touched │ | |
331 | │ │ [3] │ │ (copied?) │ (copied?) │ |
|
331 | │ │ [3] │ │ (copied?) │ (copied?) │ | |
332 | └──────────────┴──────────────┴──────────────┴──────────────┴──────────────┘ |
|
332 | └──────────────┴──────────────┴──────────────┴──────────────┴──────────────┘ | |
333 |
|
333 | |||
@@ -415,6 +415,7 b' def _process_merge(p1_ctx, p2_ctx, ctx):' | |||||
415 | nice bonus. However do not any of this yet. |
|
415 | nice bonus. However do not any of this yet. | |
416 | """ |
|
416 | """ | |
417 |
|
417 | |||
|
418 | repo = ctx.repo() | |||
418 | md = ChangingFiles() |
|
419 | md = ChangingFiles() | |
419 |
|
420 | |||
420 | m = ctx.manifest() |
|
421 | m = ctx.manifest() | |
@@ -462,7 +463,14 b' def _process_merge(p1_ctx, p2_ctx, ctx):' | |||||
462 | # case 🄽 🄾 : touched |
|
463 | # case 🄽 🄾 : touched | |
463 | md.mark_touched(filename) |
|
464 | md.mark_touched(filename) | |
464 | else: |
|
465 | else: | |
465 | # case 🄿 : merged |
|
466 | fctx = repo.filectx(filename, fileid=d1[1][0]) | |
|
467 | if fctx.p2().rev() == nullrev: | |||
|
468 | # case 🅂 | |||
|
469 | # lets assume we can trust the file history. If the | |||
|
470 | # filenode is not a merge, the file was not merged. | |||
|
471 | md.mark_touched(filename) | |||
|
472 | else: | |||
|
473 | # case 🄿 | |||
466 | md.mark_merged(filename) |
|
474 | md.mark_merged(filename) | |
467 | copy_candidates.append(filename) |
|
475 | copy_candidates.append(filename) | |
468 | else: |
|
476 | else: |
@@ -1965,25 +1965,13 b' We upgrade a repository that is not usin' | |||||
1965 | ##### revision "mBF-change-m-0 merge with extra change - B side" ##### |
|
1965 | ##### revision "mBF-change-m-0 merge with extra change - B side" ##### | |
1966 | 1 sidedata entries |
|
1966 | 1 sidedata entries | |
1967 | entry-0014 size 14 |
|
1967 | entry-0014 size 14 | |
1968 |
'\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' |
|
1968 | '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' | |
1969 | touched : d, ; (no-upgraded no-upgraded-parallel !) |
|
1969 | touched : d, ; | |
1970 | '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded missing-correct-output !) |
|
|||
1971 | touched : d, ; (upgraded missing-correct-output !) |
|
|||
1972 | '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded known-bad-output !) |
|
|||
1973 | merged : d, ; (upgraded known-bad-output !) |
|
|||
1974 | '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel missing-correct-output !) |
|
|||
1975 | touched : d, ; (upgraded-parallel missing-correct-output !) |
|
|||
1976 | '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel known-bad-output !) |
|
|||
1977 | merged : d, ; (upgraded-parallel known-bad-output !) |
|
|||
1978 | ##### revision "mFB-change-m-0 merge with extra change - B side" ##### |
|
1970 | ##### revision "mFB-change-m-0 merge with extra change - B side" ##### | |
1979 | 1 sidedata entries |
|
1971 | 1 sidedata entries | |
1980 | entry-0014 size 14 |
|
1972 | entry-0014 size 14 | |
1981 |
'\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' |
|
1973 | '\x00\x00\x00\x01\x14\x00\x00\x00\x01\x00\x00\x00\x00d' | |
1982 | touched : d, ; (no-upgraded no-upgraded-parallel !) |
|
1974 | touched : d, ; | |
1983 | '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded-parallel known-bad-output !) |
|
|||
1984 | merged : d, ; (upgraded-parallel known-bad-output !) |
|
|||
1985 | '\x00\x00\x00\x01\x08\x00\x00\x00\x01\x00\x00\x00\x00d' (upgraded known-bad-output !) |
|
|||
1986 | merged : d, ; (upgraded known-bad-output !) |
|
|||
1987 | ##### revision "mCB-change-m-0 merge explicitely revive deleted file - B side" ##### |
|
1975 | ##### revision "mCB-change-m-0 merge explicitely revive deleted file - B side" ##### | |
1988 | 1 sidedata entries |
|
1976 | 1 sidedata entries | |
1989 | entry-0014 size 14 |
|
1977 | entry-0014 size 14 | |
@@ -3418,10 +3406,8 b' Merge:' | |||||
3418 | A d |
|
3406 | A d | |
3419 | h (filelog !) |
|
3407 | h (filelog !) | |
3420 | h (sidedata !) |
|
3408 | h (sidedata !) | |
3421 |
|
|
3409 | h (upgraded !) | |
3422 |
h (upgraded |
|
3410 | h (upgraded-parallel !) | |
3423 | a (upgraded-parallel known-bad-output !) |
|
|||
3424 | h (upgraded-parallel missing-correct-output !) |
|
|||
3425 | h (changeset !) |
|
3411 | h (changeset !) | |
3426 | h (compatibility !) |
|
3412 | h (compatibility !) | |
3427 | A t |
|
3413 | A t |
General Comments 0
You need to be logged in to leave comments.
Login now