Fossil SCM
Fix a couple line length issues and modify an error message.
Commit
3527aa4474e893387017086634ec639c7546a99c
Parent
22b570f4f33e1d9…
1 file changed
+4
-2
+4
-2
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1339,11 +1339,12 @@ | ||
| 1339 | 1339 | }else{ |
| 1340 | 1340 | blob_read_from_file(&content, zFullname); |
| 1341 | 1341 | } |
| 1342 | 1342 | /* Do not emit any warnings when they are disabled. */ |
| 1343 | 1343 | if( !noWarningFlag ){ |
| 1344 | - abortCommit |= commit_warning(&content, crnlOk, binOk, unicodeOk, zFullname); | |
| 1344 | + abortCommit |= commit_warning(&content, crnlOk, binOk, | |
| 1345 | + unicodeOk, zFullname); | |
| 1345 | 1346 | } |
| 1346 | 1347 | if( chnged==1 && contains_merge_marker(&content) ){ |
| 1347 | 1348 | Blob fname; /* Relative pathname of the file */ |
| 1348 | 1349 | |
| 1349 | 1350 | nConflict++; |
| @@ -1363,11 +1364,12 @@ | ||
| 1363 | 1364 | db_finalize(&q); |
| 1364 | 1365 | if( nConflict && !allowConflict ){ |
| 1365 | 1366 | fossil_fatal("abort due to unresolved merge conflicts; " |
| 1366 | 1367 | "use --allow-conflict to override"); |
| 1367 | 1368 | } else if( abortCommit ){ |
| 1368 | - fossil_fatal("files are converted on your request. Please re-test before committing"); | |
| 1369 | + fossil_fatal("one or more files were converted on your request; " | |
| 1370 | + "please re-test before committing"); | |
| 1369 | 1371 | } |
| 1370 | 1372 | |
| 1371 | 1373 | /* Create the new manifest */ |
| 1372 | 1374 | if( blob_size(&comment)==0 ){ |
| 1373 | 1375 | blob_append(&comment, "(no comment)", -1); |
| 1374 | 1376 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1339,11 +1339,12 @@ | |
| 1339 | }else{ |
| 1340 | blob_read_from_file(&content, zFullname); |
| 1341 | } |
| 1342 | /* Do not emit any warnings when they are disabled. */ |
| 1343 | if( !noWarningFlag ){ |
| 1344 | abortCommit |= commit_warning(&content, crnlOk, binOk, unicodeOk, zFullname); |
| 1345 | } |
| 1346 | if( chnged==1 && contains_merge_marker(&content) ){ |
| 1347 | Blob fname; /* Relative pathname of the file */ |
| 1348 | |
| 1349 | nConflict++; |
| @@ -1363,11 +1364,12 @@ | |
| 1363 | db_finalize(&q); |
| 1364 | if( nConflict && !allowConflict ){ |
| 1365 | fossil_fatal("abort due to unresolved merge conflicts; " |
| 1366 | "use --allow-conflict to override"); |
| 1367 | } else if( abortCommit ){ |
| 1368 | fossil_fatal("files are converted on your request. Please re-test before committing"); |
| 1369 | } |
| 1370 | |
| 1371 | /* Create the new manifest */ |
| 1372 | if( blob_size(&comment)==0 ){ |
| 1373 | blob_append(&comment, "(no comment)", -1); |
| 1374 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1339,11 +1339,12 @@ | |
| 1339 | }else{ |
| 1340 | blob_read_from_file(&content, zFullname); |
| 1341 | } |
| 1342 | /* Do not emit any warnings when they are disabled. */ |
| 1343 | if( !noWarningFlag ){ |
| 1344 | abortCommit |= commit_warning(&content, crnlOk, binOk, |
| 1345 | unicodeOk, zFullname); |
| 1346 | } |
| 1347 | if( chnged==1 && contains_merge_marker(&content) ){ |
| 1348 | Blob fname; /* Relative pathname of the file */ |
| 1349 | |
| 1350 | nConflict++; |
| @@ -1363,11 +1364,12 @@ | |
| 1364 | db_finalize(&q); |
| 1365 | if( nConflict && !allowConflict ){ |
| 1366 | fossil_fatal("abort due to unresolved merge conflicts; " |
| 1367 | "use --allow-conflict to override"); |
| 1368 | } else if( abortCommit ){ |
| 1369 | fossil_fatal("one or more files were converted on your request; " |
| 1370 | "please re-test before committing"); |
| 1371 | } |
| 1372 | |
| 1373 | /* Create the new manifest */ |
| 1374 | if( blob_size(&comment)==0 ){ |
| 1375 | blob_append(&comment, "(no comment)", -1); |
| 1376 |