Hey all, In wc-1, we record filenames where merge sources are stored, and where property rejects are written. These are:
entry->conflict_wrk, ->conflict_old, ->conflict_new, and ->prejfile These file names do not appear to have any corresponding values in the proposed skels detailed in notes/wc-ng/conflict-storage. We cannot simply derive the filenames because there may be versioned (or unversioned) content with the same names. We don't apply/make rules on file naming, so the code works on finding unique names along certain understandable patterns. But I believe we need to record *what* name was chosen. I'm unsure of how to model this. Any ideas? Cheers, -g
