Mercurial > hg
comparison tests/test-resolve.t @ 38857:96d0795bd0bd
resolve: graduate resolve.mark-check from experimental, add docs
Since this hasn't been in a release yet, I'm not bothering to add an alias for
the experimental name of the config variable.
Differential Revision: https://phab.mercurial-scm.org/D4071
| author | Kyle Lippincott <spectral@google.com> |
|---|---|
| date | Fri, 03 Aug 2018 12:57:44 -0700 |
| parents | f8732e33bcbc |
| children | db03e5cefc82 |
comparison
equal
deleted
inserted
replaced
| 38856:a01200b25da6 | 38857:96d0795bd0bd |
|---|---|
| 381 [1] | 381 [1] |
| 382 $ hg resolve -l | 382 $ hg resolve -l |
| 383 U file1 | 383 U file1 |
| 384 U file2 | 384 U file2 |
| 385 $ echo 'remove markers' > file1 | 385 $ echo 'remove markers' > file1 |
| 386 $ hg --config experimental.resolve.mark-check=abort resolve -m | 386 $ hg --config commands.resolve.mark-check=abort resolve -m |
| 387 warning: the following files still have conflict markers: | 387 warning: the following files still have conflict markers: |
| 388 file2 | 388 file2 |
| 389 abort: conflict markers detected | 389 abort: conflict markers detected |
| 390 (use --all to mark anyway) | 390 (use --all to mark anyway) |
| 391 [255] | 391 [255] |
| 392 $ hg resolve -l | 392 $ hg resolve -l |
| 393 U file1 | 393 U file1 |
| 394 U file2 | 394 U file2 |
| 395 Try with --all from the hint | 395 Try with --all from the hint |
| 396 $ hg --config experimental.resolve.mark-check=abort resolve -m --all | 396 $ hg --config commands.resolve.mark-check=abort resolve -m --all |
| 397 warning: the following files still have conflict markers: | 397 warning: the following files still have conflict markers: |
| 398 file2 | 398 file2 |
| 399 (no more unresolved files) | 399 (no more unresolved files) |
| 400 $ hg resolve -l | 400 $ hg resolve -l |
| 401 R file1 | 401 R file1 |
| 402 R file2 | 402 R file2 |
| 403 $ hg resolve --unmark | 403 $ hg resolve --unmark |
| 404 $ hg resolve -l | 404 $ hg resolve -l |
| 405 U file1 | 405 U file1 |
| 406 U file2 | 406 U file2 |
| 407 $ hg --config experimental.resolve.mark-check=warn resolve -m | 407 $ hg --config commands.resolve.mark-check=warn resolve -m |
| 408 warning: the following files still have conflict markers: | 408 warning: the following files still have conflict markers: |
| 409 file2 | 409 file2 |
| 410 (no more unresolved files) | 410 (no more unresolved files) |
| 411 $ hg resolve -l | 411 $ hg resolve -l |
| 412 R file1 | 412 R file1 |
| 414 If the file is already marked as resolved, we don't warn about it | 414 If the file is already marked as resolved, we don't warn about it |
| 415 $ hg resolve --unmark file1 | 415 $ hg resolve --unmark file1 |
| 416 $ hg resolve -l | 416 $ hg resolve -l |
| 417 U file1 | 417 U file1 |
| 418 R file2 | 418 R file2 |
| 419 $ hg --config experimental.resolve.mark-check=warn resolve -m | 419 $ hg --config commands.resolve.mark-check=warn resolve -m |
| 420 (no more unresolved files) | 420 (no more unresolved files) |
| 421 $ hg resolve -l | 421 $ hg resolve -l |
| 422 R file1 | 422 R file1 |
| 423 R file2 | 423 R file2 |
| 424 | 424 |