73
74
75
76
77
78
79
80
81
82
83
84
85
86
|
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
|
+
+
+
|
fossil_fatal("abort due to unresolved merge conflicts; "
"use --allow-conflict to override");
```
The corresponding code in libf looks *much* different than that now, and it's not currently (2021-09-17) clear whether or how that change would need to apply to libf's impl
## Annotate Limits
Fossil's annotate feature offers the ability to limit the depth of the annotation based on the processing time. Ours only offers to limit it by version depth. We have the pieces necessary for timing such a limit, it just needs to be integrated into the annotate routine. Doing so would be straightforward, it just needs to be done.
# Security-relevant
But not otherwise SCM-relevant...
- **Port over `db_unprotect()` and `db_protect_pop()`** APIs, which allow a db to effectively be made read-only except for limited windows where specific sections of it needs to be writable. Related: `db.c:db_top_autorizer()`.
|