Fossil SCM
missed a small part when merging
Commit
5d3a492d8a3fbd2a3467679b68c9f63232386f79
Parent
43caa73788d1226…
1 file changed
+4
-1
+4
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1091,10 +1091,11 @@ | ||
| 1091 | 1091 | Blob cksum1, cksum2; /* Before and after commit checksums */ |
| 1092 | 1092 | Blob cksum1b; /* Checksum recorded in the manifest */ |
| 1093 | 1093 | int szD; /* Size of the delta manifest */ |
| 1094 | 1094 | int szB; /* Size of the baseline manifest */ |
| 1095 | 1095 | int nConflict = 0; /* Number of unresolved merge conflicts */ |
| 1096 | + int abortCommit = 0; | |
| 1096 | 1097 | Blob ans; |
| 1097 | 1098 | char cReply; |
| 1098 | 1099 | |
| 1099 | 1100 | url_proxy_options(); |
| 1100 | 1101 | noSign = find_option("nosign",0,0)!=0; |
| @@ -1338,11 +1339,11 @@ | ||
| 1338 | 1339 | }else{ |
| 1339 | 1340 | blob_read_from_file(&content, zFullname); |
| 1340 | 1341 | } |
| 1341 | 1342 | /* Do not emit any warnings when they are disabled. */ |
| 1342 | 1343 | if( !noWarningFlag ){ |
| 1343 | - commit_warning(&content, crnlOk, binOk, unicodeOk, zFullname); | |
| 1344 | + abortCommit |= commit_warning(&content, crnlOk, binOk, unicodeOk, zFullname); | |
| 1344 | 1345 | } |
| 1345 | 1346 | if( chnged==1 && contains_merge_marker(&content) ){ |
| 1346 | 1347 | Blob fname; /* Relative pathname of the file */ |
| 1347 | 1348 | |
| 1348 | 1349 | nConflict++; |
| @@ -1361,10 +1362,12 @@ | ||
| 1361 | 1362 | } |
| 1362 | 1363 | db_finalize(&q); |
| 1363 | 1364 | if( nConflict && !allowConflict ){ |
| 1364 | 1365 | fossil_fatal("abort due to unresolved merge conflicts; " |
| 1365 | 1366 | "use --allow-conflict to override"); |
| 1367 | + } else if( abortCommit ){ | |
| 1368 | + fossil_fatal("files are converted on your request. Please re-test before committing"); | |
| 1366 | 1369 | } |
| 1367 | 1370 | |
| 1368 | 1371 | /* Create the new manifest */ |
| 1369 | 1372 | if( blob_size(&comment)==0 ){ |
| 1370 | 1373 | blob_append(&comment, "(no comment)", -1); |
| 1371 | 1374 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1091,10 +1091,11 @@ | |
| 1091 | Blob cksum1, cksum2; /* Before and after commit checksums */ |
| 1092 | Blob cksum1b; /* Checksum recorded in the manifest */ |
| 1093 | int szD; /* Size of the delta manifest */ |
| 1094 | int szB; /* Size of the baseline manifest */ |
| 1095 | int nConflict = 0; /* Number of unresolved merge conflicts */ |
| 1096 | Blob ans; |
| 1097 | char cReply; |
| 1098 | |
| 1099 | url_proxy_options(); |
| 1100 | noSign = find_option("nosign",0,0)!=0; |
| @@ -1338,11 +1339,11 @@ | |
| 1338 | }else{ |
| 1339 | blob_read_from_file(&content, zFullname); |
| 1340 | } |
| 1341 | /* Do not emit any warnings when they are disabled. */ |
| 1342 | if( !noWarningFlag ){ |
| 1343 | commit_warning(&content, crnlOk, binOk, unicodeOk, zFullname); |
| 1344 | } |
| 1345 | if( chnged==1 && contains_merge_marker(&content) ){ |
| 1346 | Blob fname; /* Relative pathname of the file */ |
| 1347 | |
| 1348 | nConflict++; |
| @@ -1361,10 +1362,12 @@ | |
| 1361 | } |
| 1362 | db_finalize(&q); |
| 1363 | if( nConflict && !allowConflict ){ |
| 1364 | fossil_fatal("abort due to unresolved merge conflicts; " |
| 1365 | "use --allow-conflict to override"); |
| 1366 | } |
| 1367 | |
| 1368 | /* Create the new manifest */ |
| 1369 | if( blob_size(&comment)==0 ){ |
| 1370 | blob_append(&comment, "(no comment)", -1); |
| 1371 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1091,10 +1091,11 @@ | |
| 1091 | Blob cksum1, cksum2; /* Before and after commit checksums */ |
| 1092 | Blob cksum1b; /* Checksum recorded in the manifest */ |
| 1093 | int szD; /* Size of the delta manifest */ |
| 1094 | int szB; /* Size of the baseline manifest */ |
| 1095 | int nConflict = 0; /* Number of unresolved merge conflicts */ |
| 1096 | int abortCommit = 0; |
| 1097 | Blob ans; |
| 1098 | char cReply; |
| 1099 | |
| 1100 | url_proxy_options(); |
| 1101 | noSign = find_option("nosign",0,0)!=0; |
| @@ -1338,11 +1339,11 @@ | |
| 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++; |
| @@ -1361,10 +1362,12 @@ | |
| 1362 | } |
| 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 |