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
90
91
92
93
94
|
+
+
+
+
+
+
+
+
|
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
## Merge Conflict Markers (2021-11)
The format of fossil's merge conflict markets changed on 2021-11-06:
<https://fossil-scm.org/home/info/14f44e933c0c0c2c>
Whether or not that's something we need to port in is as yet unclear. As of this writing, that change is described as incomplete, so an assessment on whether it needs to be ported will wait until it is considered complete.
# 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()`.
# Non-SCM TODOs
|