Fossil SCM
Added a warning about loss of stash and undo when performing the 'interim workaround' for an RID mismatch.
Commit
cc44fa8425e9ba8554263ca6b2d993a414665469e6b50c07605e3e1e536bfff1
Parent
bf7c2e94f164feb…
1 file changed
+3
-1
M
src/db.c
+3
-1
| --- src/db.c | ||
| +++ src/db.c | ||
| @@ -1675,11 +1675,13 @@ | ||
| 1675 | 1675 | "that automatically, but we are not there yet. Sorry.\n\n" |
| 1676 | 1676 | ); |
| 1677 | 1677 | fossil_print( |
| 1678 | 1678 | "As an interim workaround, try:\n" |
| 1679 | 1679 | " %s close --force\n" |
| 1680 | - " %s open \"%s\" --keep\n\n", | |
| 1680 | + " %s open \"%s\" --keep\n" | |
| 1681 | + "Noting that any STASH and UNDO information " | |
| 1682 | + "WILL BE IRREVOCABLY LOST.\n\n", | |
| 1681 | 1683 | g.argv[0], |
| 1682 | 1684 | g.argv[0], zDbName |
| 1683 | 1685 | ); |
| 1684 | 1686 | fossil_fatal("bad fingerprint"); |
| 1685 | 1687 | } |
| 1686 | 1688 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1675,11 +1675,13 @@ | |
| 1675 | "that automatically, but we are not there yet. Sorry.\n\n" |
| 1676 | ); |
| 1677 | fossil_print( |
| 1678 | "As an interim workaround, try:\n" |
| 1679 | " %s close --force\n" |
| 1680 | " %s open \"%s\" --keep\n\n", |
| 1681 | g.argv[0], |
| 1682 | g.argv[0], zDbName |
| 1683 | ); |
| 1684 | fossil_fatal("bad fingerprint"); |
| 1685 | } |
| 1686 |
| --- src/db.c | |
| +++ src/db.c | |
| @@ -1675,11 +1675,13 @@ | |
| 1675 | "that automatically, but we are not there yet. Sorry.\n\n" |
| 1676 | ); |
| 1677 | fossil_print( |
| 1678 | "As an interim workaround, try:\n" |
| 1679 | " %s close --force\n" |
| 1680 | " %s open \"%s\" --keep\n" |
| 1681 | "Noting that any STASH and UNDO information " |
| 1682 | "WILL BE IRREVOCABLY LOST.\n\n", |
| 1683 | g.argv[0], |
| 1684 | g.argv[0], zDbName |
| 1685 | ); |
| 1686 | fossil_fatal("bad fingerprint"); |
| 1687 | } |
| 1688 |