Fossil SCM
src/checkin.c changes
Commit
efdd823f28a67d6ce293e9a8c0eacdbc197ae2731564ef0f619d38fcb5d80c4e
Parent
a35cfda912e476b…
1 file changed
+4
-4
+4
-4
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -567,11 +567,11 @@ | ||
| 567 | 567 | } |
| 568 | 568 | |
| 569 | 569 | /* Confirm current working directory is within check-out. */ |
| 570 | 570 | db_must_be_within_tree(); |
| 571 | 571 | |
| 572 | - /* Get check-out version. l*/ | |
| 572 | + /* Get check-out version. */ | |
| 573 | 573 | vid = db_lget_int("checkout", 0); |
| 574 | 574 | |
| 575 | 575 | /* Relative path flag determination is done by a shared function. */ |
| 576 | 576 | if( determine_cwd_relative_option() ){ |
| 577 | 577 | flags |= C_RELPATH; |
| @@ -2318,11 +2318,11 @@ | ||
| 2318 | 2318 | ** |
| 2319 | 2319 | ** A check-in is not permitted to fork unless the --allow-fork option |
| 2320 | 2320 | ** appears. An empty check-in (i.e. with nothing changed) is not |
| 2321 | 2321 | ** allowed unless the --allow-empty option appears. A check-in may not |
| 2322 | 2322 | ** be older than its ancestor unless the --allow-older option appears. |
| 2323 | -** If any of files in the check-in appear to contain unresolved merge | |
| 2323 | +** If any files in the check-in appear to contain unresolved merge | |
| 2324 | 2324 | ** conflicts, the check-in will not be allowed unless the |
| 2325 | 2325 | ** --allow-conflict option is present. In addition, the entire |
| 2326 | 2326 | ** check-in process may be aborted if a file contains content that |
| 2327 | 2327 | ** appears to be binary, Unicode text, or text with CR/LF line endings |
| 2328 | 2328 | ** unless the interactive user chooses to proceed. If there is no |
| @@ -2358,11 +2358,11 @@ | ||
| 2358 | 2358 | ** than relying on file mtimes |
| 2359 | 2359 | ** --ignore-clock-skew If a clock skew is detected, ignore it and |
| 2360 | 2360 | ** behave as if the user had entered 'yes' to |
| 2361 | 2361 | ** the question of whether to proceed despite |
| 2362 | 2362 | ** the skew. |
| 2363 | -** --ignore-oversize Do not warning the user about oversized files | |
| 2363 | +** --ignore-oversize Do not warn the user about oversized files | |
| 2364 | 2364 | ** --integrate Close all merged-in branches |
| 2365 | 2365 | ** -m|--comment COMMENT-TEXT Use COMMENT-TEXT as commit comment |
| 2366 | 2366 | ** -M|--message-file FILE Read the commit comment from given file |
| 2367 | 2367 | ** --mimetype MIMETYPE Mimetype of check-in comment |
| 2368 | 2368 | ** -n|--dry-run If given, display instead of run actions |
| @@ -2560,11 +2560,11 @@ | ||
| 2560 | 2560 | ** |
| 2561 | 2561 | ** If the remote repository sent an avoid-delta-manifests pragma on |
| 2562 | 2562 | ** the autosync above, then also try to avoid deltas, unless the |
| 2563 | 2563 | ** --delta option is specified. The remote repo will send the |
| 2564 | 2564 | ** avoid-delta-manifests pragma if it has its "forbid-delta-manifests" |
| 2565 | - ** setting is enabled. | |
| 2565 | + ** setting enabled. | |
| 2566 | 2566 | */ |
| 2567 | 2567 | if( !db_get_boolean("seen-delta-manifest",0) |
| 2568 | 2568 | || db_get_boolean("forbid-delta-manifests",0) |
| 2569 | 2569 | || g.bAvoidDeltaManifests |
| 2570 | 2570 | ){ |
| 2571 | 2571 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -567,11 +567,11 @@ | |
| 567 | } |
| 568 | |
| 569 | /* Confirm current working directory is within check-out. */ |
| 570 | db_must_be_within_tree(); |
| 571 | |
| 572 | /* Get check-out version. l*/ |
| 573 | vid = db_lget_int("checkout", 0); |
| 574 | |
| 575 | /* Relative path flag determination is done by a shared function. */ |
| 576 | if( determine_cwd_relative_option() ){ |
| 577 | flags |= C_RELPATH; |
| @@ -2318,11 +2318,11 @@ | |
| 2318 | ** |
| 2319 | ** A check-in is not permitted to fork unless the --allow-fork option |
| 2320 | ** appears. An empty check-in (i.e. with nothing changed) is not |
| 2321 | ** allowed unless the --allow-empty option appears. A check-in may not |
| 2322 | ** be older than its ancestor unless the --allow-older option appears. |
| 2323 | ** If any of files in the check-in appear to contain unresolved merge |
| 2324 | ** conflicts, the check-in will not be allowed unless the |
| 2325 | ** --allow-conflict option is present. In addition, the entire |
| 2326 | ** check-in process may be aborted if a file contains content that |
| 2327 | ** appears to be binary, Unicode text, or text with CR/LF line endings |
| 2328 | ** unless the interactive user chooses to proceed. If there is no |
| @@ -2358,11 +2358,11 @@ | |
| 2358 | ** than relying on file mtimes |
| 2359 | ** --ignore-clock-skew If a clock skew is detected, ignore it and |
| 2360 | ** behave as if the user had entered 'yes' to |
| 2361 | ** the question of whether to proceed despite |
| 2362 | ** the skew. |
| 2363 | ** --ignore-oversize Do not warning the user about oversized files |
| 2364 | ** --integrate Close all merged-in branches |
| 2365 | ** -m|--comment COMMENT-TEXT Use COMMENT-TEXT as commit comment |
| 2366 | ** -M|--message-file FILE Read the commit comment from given file |
| 2367 | ** --mimetype MIMETYPE Mimetype of check-in comment |
| 2368 | ** -n|--dry-run If given, display instead of run actions |
| @@ -2560,11 +2560,11 @@ | |
| 2560 | ** |
| 2561 | ** If the remote repository sent an avoid-delta-manifests pragma on |
| 2562 | ** the autosync above, then also try to avoid deltas, unless the |
| 2563 | ** --delta option is specified. The remote repo will send the |
| 2564 | ** avoid-delta-manifests pragma if it has its "forbid-delta-manifests" |
| 2565 | ** setting is enabled. |
| 2566 | */ |
| 2567 | if( !db_get_boolean("seen-delta-manifest",0) |
| 2568 | || db_get_boolean("forbid-delta-manifests",0) |
| 2569 | || g.bAvoidDeltaManifests |
| 2570 | ){ |
| 2571 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -567,11 +567,11 @@ | |
| 567 | } |
| 568 | |
| 569 | /* Confirm current working directory is within check-out. */ |
| 570 | db_must_be_within_tree(); |
| 571 | |
| 572 | /* Get check-out version. */ |
| 573 | vid = db_lget_int("checkout", 0); |
| 574 | |
| 575 | /* Relative path flag determination is done by a shared function. */ |
| 576 | if( determine_cwd_relative_option() ){ |
| 577 | flags |= C_RELPATH; |
| @@ -2318,11 +2318,11 @@ | |
| 2318 | ** |
| 2319 | ** A check-in is not permitted to fork unless the --allow-fork option |
| 2320 | ** appears. An empty check-in (i.e. with nothing changed) is not |
| 2321 | ** allowed unless the --allow-empty option appears. A check-in may not |
| 2322 | ** be older than its ancestor unless the --allow-older option appears. |
| 2323 | ** If any files in the check-in appear to contain unresolved merge |
| 2324 | ** conflicts, the check-in will not be allowed unless the |
| 2325 | ** --allow-conflict option is present. In addition, the entire |
| 2326 | ** check-in process may be aborted if a file contains content that |
| 2327 | ** appears to be binary, Unicode text, or text with CR/LF line endings |
| 2328 | ** unless the interactive user chooses to proceed. If there is no |
| @@ -2358,11 +2358,11 @@ | |
| 2358 | ** than relying on file mtimes |
| 2359 | ** --ignore-clock-skew If a clock skew is detected, ignore it and |
| 2360 | ** behave as if the user had entered 'yes' to |
| 2361 | ** the question of whether to proceed despite |
| 2362 | ** the skew. |
| 2363 | ** --ignore-oversize Do not warn the user about oversized files |
| 2364 | ** --integrate Close all merged-in branches |
| 2365 | ** -m|--comment COMMENT-TEXT Use COMMENT-TEXT as commit comment |
| 2366 | ** -M|--message-file FILE Read the commit comment from given file |
| 2367 | ** --mimetype MIMETYPE Mimetype of check-in comment |
| 2368 | ** -n|--dry-run If given, display instead of run actions |
| @@ -2560,11 +2560,11 @@ | |
| 2560 | ** |
| 2561 | ** If the remote repository sent an avoid-delta-manifests pragma on |
| 2562 | ** the autosync above, then also try to avoid deltas, unless the |
| 2563 | ** --delta option is specified. The remote repo will send the |
| 2564 | ** avoid-delta-manifests pragma if it has its "forbid-delta-manifests" |
| 2565 | ** setting enabled. |
| 2566 | */ |
| 2567 | if( !db_get_boolean("seen-delta-manifest",0) |
| 2568 | || db_get_boolean("forbid-delta-manifests",0) |
| 2569 | || g.bAvoidDeltaManifests |
| 2570 | ){ |
| 2571 |