3180 a (upgraded !) |
3180 a (upgraded !) |
3181 |
3181 |
3182 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mK,AEm")' f |
3182 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mK,AEm")' f |
3183 A f |
3183 A f |
3184 a (filelog !) |
3184 a (filelog !) |
3185 a (missing-correct-output sidedata !) |
3185 a (sidedata !) |
3186 a (missing-correct-output upgraded !) |
3186 a (upgraded !) |
3187 b (known-bad-output sidedata !) |
|
3188 b (known-bad-output upgraded !) |
|
3189 |
3187 |
3190 |
3188 |
3191 The result from mEAm is the same for the subsequent merge: |
3189 The result from mEAm is the same for the subsequent merge: |
3192 |
3190 |
3193 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEAm")' f |
3191 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEAm")' f |
3203 b (upgraded !) |
3201 b (upgraded !) |
3204 |
3202 |
3205 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mJ,EAm")' f |
3203 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mJ,EAm")' f |
3206 A f |
3204 A f |
3207 a (filelog !) |
3205 a (filelog !) |
3208 b (missing-correct-output sidedata !) |
3206 b (sidedata !) |
3209 b (missing-correct-output upgraded !) |
3207 b (upgraded !) |
3210 a (known-bad-output sidedata !) |
|
3211 a (known-bad-output upgraded !) |
|
3212 |
3208 |
3213 Subcase: chaining conflicting rename resolution |
3209 Subcase: chaining conflicting rename resolution |
3214 ``````````````````````````````````````````````` |
3210 ``````````````````````````````````````````````` |
3215 |
3211 |
3216 The "mPQm" and "mQPm" case create a rename tracking conflict on file 'v'. We |
3212 The "mPQm" and "mQPm" case create a rename tracking conflict on file 'v'. We |
3233 p (upgraded !) |
3229 p (upgraded !) |
3234 |
3230 |
3235 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mT,PQm")' v |
3231 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mT,PQm")' v |
3236 A v |
3232 A v |
3237 r (filelog !) |
3233 r (filelog !) |
3238 p (missing-correct-output sidedata !) |
3234 p (sidedata !) |
3239 p (missing-correct-output upgraded !) |
3235 p (upgraded !) |
3240 r (known-bad-output sidedata !) |
|
3241 r (known-bad-output upgraded !) |
|
3242 |
3236 |
3243 |
3237 |
3244 The result from mQPm is the same for the subsequent merge: |
3238 The result from mQPm is the same for the subsequent merge: |
3245 |
3239 |
3246 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mQPm")' v |
3240 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mQPm")' v |
3252 r (no-changeset no-compatibility !) |
3246 r (no-changeset no-compatibility !) |
3253 |
3247 |
3254 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mS,QPm")' v |
3248 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mS,QPm")' v |
3255 A v |
3249 A v |
3256 r (filelog !) |
3250 r (filelog !) |
3257 r (missing-correct-output sidedata !) |
3251 r (sidedata !) |
3258 r (missing-correct-output upgraded !) |
3252 r (upgraded !) |
3259 p (known-bad-output sidedata !) |
|
3260 p (known-bad-output upgraded !) |
|
3261 |
3253 |
3262 |
3254 |
3263 Subcase: chaining salvage information during a merge |
3255 Subcase: chaining salvage information during a merge |
3264 ```````````````````````````````````````````````````` |
3256 ```````````````````````````````````````````````````` |
3265 |
3257 |
3269 reference output: |
3261 reference output: |
3270 |
3262 |
3271 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB-revert-m-0")' |
3263 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB-revert-m-0")' |
3272 M b |
3264 M b |
3273 A d |
3265 A d |
3274 a (filelog !) |
3266 a (no-changeset no-compatibility !) |
3275 a (sidedata !) |
|
3276 a (upgraded !) |
|
3277 A t |
3267 A t |
3278 p |
3268 p |
3279 R a |
3269 R a |
3280 R p |
3270 R p |
3281 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC-revert-m-0")' |
3271 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC-revert-m-0")' |
3282 M b |
3272 M b |
3283 A d |
3273 A d |
3284 a (filelog !) |
3274 a (no-changeset no-compatibility !) |
3285 a (sidedata !) |
|
3286 a (upgraded !) |
|
3287 A t |
3275 A t |
3288 p |
3276 p |
3289 R a |
3277 R a |
3290 R p |
3278 R p |
3291 |
3279 |
3292 chained output |
3280 chained output |
3293 |
|
3294 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC+revert,Lm")' |
3281 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mBC+revert,Lm")' |
3295 M b |
3282 M b |
3296 A d |
3283 A d |
3297 a (filelog !) |
3284 a (no-changeset no-compatibility !) |
3298 a (missing-correct-output sidedata !) |
|
3299 a (missing-correct-output upgraded !) |
|
3300 A t |
3285 A t |
3301 p |
3286 p |
3302 A unrelated-l |
3287 A unrelated-l |
3303 R a |
3288 R a |
3304 R p |
3289 R p |
3305 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB+revert,Lm")' |
3290 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mCB+revert,Lm")' |
3306 M b |
3291 M b |
3307 A d |
3292 A d |
3308 a (filelog !) |
3293 a (no-changeset no-compatibility !) |
3309 a (missing-correct-output sidedata !) |
|
3310 a (missing-correct-output upgraded !) |
|
3311 A t |
3294 A t |
3312 p |
3295 p |
3313 A unrelated-l |
3296 A unrelated-l |
3314 R a |
3297 R a |
3315 R p |
3298 R p |
3316 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mL,BC+revertm")' |
3299 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mL,BC+revertm")' |
3317 M b |
3300 M b |
3318 A d |
3301 A d |
3319 a (filelog !) |
3302 a (no-changeset no-compatibility !) |
3320 a (missing-correct-output sidedata !) |
|
3321 a (missing-correct-output upgraded !) |
|
3322 A t |
3303 A t |
3323 p |
3304 p |
3324 A unrelated-l |
3305 A unrelated-l |
3325 R a |
3306 R a |
3326 R p |
3307 R p |
3327 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mL,CB+revertm")' |
3308 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mL,CB+revertm")' |
3328 M b |
3309 M b |
3329 A d |
3310 A d |
3330 a (filelog !) |
3311 a (no-changeset no-compatibility !) |
3331 a (missing-correct-output sidedata !) |
|
3332 a (missing-correct-output upgraded !) |
|
3333 A t |
3312 A t |
3334 p |
3313 p |
3335 A unrelated-l |
3314 A unrelated-l |
3336 R a |
3315 R a |
3337 R p |
3316 R p |
3371 h (upgraded !) |
3350 h (upgraded !) |
3372 |
3351 |
3373 |
3352 |
3374 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGF,Nm")' d |
3353 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mGF,Nm")' d |
3375 A d |
3354 A d |
3376 a (filelog !) |
3355 a (no-changeset no-compatibility !) |
3377 a (missing-correct-output sidedata !) |
|
3378 a (missing-correct-output upgraded !) |
|
3379 h (known-bad-output sidedata !) |
|
3380 h (known-bad-output upgraded !) |
|
3381 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mN,GFm")' d |
3356 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mN,GFm")' d |
3382 A d |
3357 A d |
3383 a (filelog !) |
3358 a (no-changeset no-compatibility !) |
3384 a (missing-correct-output sidedata !) |
|
3385 a (missing-correct-output upgraded !) |
|
3386 h (known-bad-output sidedata !) |
|
3387 h (known-bad-output upgraded !) |
|
3388 |
3359 |
3389 |
3360 |
3390 Subcase: chaining conflicting rename resolution, with extra change during the merge |
3361 Subcase: chaining conflicting rename resolution, with extra change during the merge |
3391 ``````````````````````````````````````````````````````````````````````````````````` |
3362 ``````````````````````````````````````````````````````````````````````````````````` |
3392 |
3363 |
3409 a (sidedata !) |
3380 a (sidedata !) |
3410 a (upgraded !) |
3381 a (upgraded !) |
3411 |
3382 |
3412 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mK,AE-change-m")' f |
3383 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mK,AE-change-m")' f |
3413 A f |
3384 A f |
3414 a (filelog !) |
3385 a (no-changeset no-compatibility !) |
3415 a (missing-correct-output sidedata !) |
|
3416 a (missing-correct-output upgraded !) |
|
3417 b (known-bad-output sidedata !) |
|
3418 b (known-bad-output upgraded !) |
|
3419 |
3386 |
3420 |
3387 |
3421 The result from mEAm is the same for the subsequent merge: |
3388 The result from mEAm is the same for the subsequent merge: |
3422 |
3389 |
3423 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEA-change-m")' f |
3390 $ hg status --copies --rev 'desc("i-0")' --rev 'desc("mEA-change-m")' f |