Fossil

Changes On Branch unresolved-rid-explanation
Login

Changes On Branch unresolved-rid-explanation

Patch Side-by-Side Diff

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

Changes In Branch unresolved-rid-explanation Excluding Merge-Ins

This is equivalent to a diff from b87bd72927 to c04e494d07

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:23
Honour global web-browser setting if running fossil ui with a path to a repository. ... (check-in: 200247bc62 user: preben tags: trunk)
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)
16:14
Enable searching of wiki titles. ... (check-in: a402dd2a88 user: preben tags: trunk)

Changes to src/vfile.c.
︙
1067
1068
1069
1070
1071
1072
1073
1074








1075
1076
1077
1078
1079
1080
1081

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", zUnresolved);
    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)"
︙