Martin von Zweigbergk ea82340654 working_copy: preserve conflicts in the working copy until markers are removed ... I realized only recently that we can try to parse conflict markers in files and leave them as conflicted if they haven't changed. If they have changed and some conflict markers have been removed, we can even update the conflict with that partial resolution. This change teaches the working copy to write conflicts to the working copy. It used to expect that the caller had already updated the tree by materializing conflicts. With this change, we also start parsing the conflict markers and leave the conflicts unresolved in the working copy if the conflict markers remain. There are some cases that we don't handle yet. For example, we don't even try to set the executable bit correctly when we write conflicts. OTOH, we didn't do that even before this change. We still never actually write conflicts to the working copy (outside of tests) because we currently materialize conflicts in `MutRepo::check_out()`. I'll change that next.		2021-11-07 15:17:51 -08:00
..
op_store.proto	view: add support for ref-based branches and tags to model	2021-08-04 11:33:57 -07:00
store.proto	backend: remove unused Commit::is_pruned (#32)	2021-10-06 23:53:15 -07:00
working_copy.proto	working_copy: preserve conflicts in the working copy until markers are removed	2021-11-07 15:17:51 -08:00