Fossil SCM
Restore fossil_fatal panic message in case of possible checkout/repo mismatch.
Commit
8e7edc60fa0ec8c9060a36a966a683b506b3d868
Parent
ebe92f5cfb96dae…
1 file changed
+1
-1
+1
-1
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -995,11 +995,11 @@ | ||
| 995 | 995 | if( vid ){ |
| 996 | 996 | zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d AND " |
| 997 | 997 | "EXISTS(SELECT 1 FROM event WHERE event.type='ci' and event.objid=%d)", |
| 998 | 998 | vid, vid); |
| 999 | 999 | if( !zParentUuid ){ |
| 1000 | - fossil_fatal("Could not find valid manifest for RID %d. " | |
| 1000 | + fossil_fatal("Could not find a valid check-in for RID %d. " | |
| 1001 | 1001 | "Possible checkout/repo mismatch.", vid); |
| 1002 | 1002 | } |
| 1003 | 1003 | } |
| 1004 | 1004 | if( pBaseline ){ |
| 1005 | 1005 | blob_appendf(pOut, "B %s\n", zBaselineUuid); |
| 1006 | 1006 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -995,11 +995,11 @@ | |
| 995 | if( vid ){ |
| 996 | zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d AND " |
| 997 | "EXISTS(SELECT 1 FROM event WHERE event.type='ci' and event.objid=%d)", |
| 998 | vid, vid); |
| 999 | if( !zParentUuid ){ |
| 1000 | fossil_fatal("Could not find valid manifest for RID %d. " |
| 1001 | "Possible checkout/repo mismatch.", vid); |
| 1002 | } |
| 1003 | } |
| 1004 | if( pBaseline ){ |
| 1005 | blob_appendf(pOut, "B %s\n", zBaselineUuid); |
| 1006 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -995,11 +995,11 @@ | |
| 995 | if( vid ){ |
| 996 | zParentUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d AND " |
| 997 | "EXISTS(SELECT 1 FROM event WHERE event.type='ci' and event.objid=%d)", |
| 998 | vid, vid); |
| 999 | if( !zParentUuid ){ |
| 1000 | fossil_fatal("Could not find a valid check-in for RID %d. " |
| 1001 | "Possible checkout/repo mismatch.", vid); |
| 1002 | } |
| 1003 | } |
| 1004 | if( pBaseline ){ |
| 1005 | blob_appendf(pOut, "B %s\n", zBaselineUuid); |
| 1006 |