Fossil

Check-in [c04e494d07]
Login

Check-in [c04e494d07]

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:Add more information when user encounters an Unresolved RID condition.
Downloads: Tarball | ZIP archive
Timelines: family | ancestors | descendants | both | unresolved-rid-explanation
Files: files | file ages | folders
SHA3-256: c04e494d0727db174649dd4f92e234e626de006201703f6ae90747e7d5c993fe
User & Date: preben 2023-11-16 12:16:41.226
Context
2024-01-05
21:02
Add more information when user encounters an Unresolved RID condition. ... (check-in: c8fda6a62c user: preben tags: trunk)
2023-11-16
12:16
Add more information when user encounters an Unresolved RID condition. ... (Closed-Leaf check-in: c04e494d07 user: preben tags: unresolved-rid-explanation)
2023-11-14
21:29
Move an invariable test outside a while loop. ... (check-in: b87bd72927 user: danield tags: trunk)
Changes
Unified Diff Ignore Whitespace Patch
Changes to src/vfile.c.
︙︙
1067
1068
1069
1070
1071
1072
1073
1074







1075
1076
1077
1078
1079
1080
1081

     "  UNION SELECT %d"
     ")"
     "SELECT group_concat(x,' ') FROM allrid"
     " WHERE x<>0 AND x NOT IN (SELECT oldrid FROM idMap);",
     oldVid
  );
  if( zUnresolved[0] ){
    fossil_fatal("Unresolved RID values: %s\n", zUnresolved);







  }

  /* Make the changes to the VFILE and VMERGE tables */
  if( !dryRun ){
    db_multi_exec(
      "UPDATE vfile"
      "   SET rid=(SELECT newrid FROM idMap WHERE oldrid=vfile.rid)"








|
>
>
>
>
>
>
>








1067
1068
1069
1070
1071
1072
1073
1074
1075
1076
1077
1078
1079
1080
1081
1082
1083
1084
1085
1086
1087
1088

     "  UNION SELECT %d"
     ")"
     "SELECT group_concat(x,' ') FROM allrid"
     " WHERE x<>0 AND x NOT IN (SELECT oldrid FROM idMap);",
     oldVid
  );
  if( zUnresolved[0] ){
    fossil_fatal("Unresolved RID values: %s\n"
        "\n"
        "Local check-out database is out of sync with repository file:\n"
        "\n"
        "    %s\n"
        "\n"
        "Has the repository file been replaced?\n",
        zUnresolved, db_repository_filename());
  }

  /* Make the changes to the VFILE and VMERGE tables */
  if( !dryRun ){
    db_multi_exec(
      "UPDATE vfile"
      "   SET rid=(SELECT newrid FROM idMap WHERE oldrid=vfile.rid)"
︙︙