Fossil SCM
Add more information when user encounters an Unresolved RID condition.
Commit
c8fda6a62cc5c6ead64500864d58d6056a698433969ed4ae63f33b27e00d54b9
Parent
bc9e84bb278f13e…
1 file changed
+8
-1
+8
-1
| --- src/vfile.c | ||
| +++ src/vfile.c | ||
| @@ -1069,11 +1069,18 @@ | ||
| 1069 | 1069 | "SELECT group_concat(x,' ') FROM allrid" |
| 1070 | 1070 | " WHERE x<>0 AND x NOT IN (SELECT oldrid FROM idMap);", |
| 1071 | 1071 | oldVid |
| 1072 | 1072 | ); |
| 1073 | 1073 | if( zUnresolved[0] ){ |
| 1074 | - fossil_fatal("Unresolved RID values: %s\n", zUnresolved); | |
| 1074 | + fossil_fatal("Unresolved RID values: %s\n" | |
| 1075 | + "\n" | |
| 1076 | + "Local check-out database is out of sync with repository file:\n" | |
| 1077 | + "\n" | |
| 1078 | + " %s\n" | |
| 1079 | + "\n" | |
| 1080 | + "Has the repository file been replaced?\n", | |
| 1081 | + zUnresolved, db_repository_filename()); | |
| 1075 | 1082 | } |
| 1076 | 1083 | |
| 1077 | 1084 | /* Make the changes to the VFILE and VMERGE tables */ |
| 1078 | 1085 | if( !dryRun ){ |
| 1079 | 1086 | db_multi_exec( |
| 1080 | 1087 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -1069,11 +1069,18 @@ | |
| 1069 | "SELECT group_concat(x,' ') FROM allrid" |
| 1070 | " WHERE x<>0 AND x NOT IN (SELECT oldrid FROM idMap);", |
| 1071 | oldVid |
| 1072 | ); |
| 1073 | if( zUnresolved[0] ){ |
| 1074 | fossil_fatal("Unresolved RID values: %s\n", zUnresolved); |
| 1075 | } |
| 1076 | |
| 1077 | /* Make the changes to the VFILE and VMERGE tables */ |
| 1078 | if( !dryRun ){ |
| 1079 | db_multi_exec( |
| 1080 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -1069,11 +1069,18 @@ | |
| 1069 | "SELECT group_concat(x,' ') FROM allrid" |
| 1070 | " WHERE x<>0 AND x NOT IN (SELECT oldrid FROM idMap);", |
| 1071 | oldVid |
| 1072 | ); |
| 1073 | if( zUnresolved[0] ){ |
| 1074 | fossil_fatal("Unresolved RID values: %s\n" |
| 1075 | "\n" |
| 1076 | "Local check-out database is out of sync with repository file:\n" |
| 1077 | "\n" |
| 1078 | " %s\n" |
| 1079 | "\n" |
| 1080 | "Has the repository file been replaced?\n", |
| 1081 | zUnresolved, db_repository_filename()); |
| 1082 | } |
| 1083 | |
| 1084 | /* Make the changes to the VFILE and VMERGE tables */ |
| 1085 | if( !dryRun ){ |
| 1086 | db_multi_exec( |
| 1087 |