Fossil SCM
Modify commit error message about unresolved merge conflicts to include the option used to disable the check.
Commit
2ff70a313088a4ff9a4adb74a846e2d5605e2051
Parent
5e83504f780d6fa…
1 file changed
+2
-1
+2
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -1332,11 +1332,12 @@ | ||
| 1332 | 1332 | db_multi_exec("UPDATE vfile SET mrid=%d, rid=%d WHERE id=%d", nrid,nrid,id); |
| 1333 | 1333 | db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nrid); |
| 1334 | 1334 | } |
| 1335 | 1335 | db_finalize(&q); |
| 1336 | 1336 | if( nConflict && !allowConflict ){ |
| 1337 | - fossil_fatal("abort due to unresolved merge conflicts"); | |
| 1337 | + fossil_fatal("abort due to unresolved merge conflicts; " | |
| 1338 | + "use --allow-conflict to override"); | |
| 1338 | 1339 | } |
| 1339 | 1340 | |
| 1340 | 1341 | /* Create the new manifest */ |
| 1341 | 1342 | if( blob_size(&comment)==0 ){ |
| 1342 | 1343 | blob_append(&comment, "(no comment)", -1); |
| 1343 | 1344 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1332,11 +1332,12 @@ | |
| 1332 | db_multi_exec("UPDATE vfile SET mrid=%d, rid=%d WHERE id=%d", nrid,nrid,id); |
| 1333 | db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nrid); |
| 1334 | } |
| 1335 | db_finalize(&q); |
| 1336 | if( nConflict && !allowConflict ){ |
| 1337 | fossil_fatal("abort due to unresolved merge conflicts"); |
| 1338 | } |
| 1339 | |
| 1340 | /* Create the new manifest */ |
| 1341 | if( blob_size(&comment)==0 ){ |
| 1342 | blob_append(&comment, "(no comment)", -1); |
| 1343 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -1332,11 +1332,12 @@ | |
| 1332 | db_multi_exec("UPDATE vfile SET mrid=%d, rid=%d WHERE id=%d", nrid,nrid,id); |
| 1333 | db_multi_exec("INSERT OR IGNORE INTO unsent VALUES(%d)", nrid); |
| 1334 | } |
| 1335 | db_finalize(&q); |
| 1336 | if( nConflict && !allowConflict ){ |
| 1337 | fossil_fatal("abort due to unresolved merge conflicts; " |
| 1338 | "use --allow-conflict to override"); |
| 1339 | } |
| 1340 | |
| 1341 | /* Create the new manifest */ |
| 1342 | if( blob_size(&comment)==0 ){ |
| 1343 | blob_append(&comment, "(no comment)", -1); |
| 1344 |