Hello,

running a "fossil merge mybranch" fails to create some files, if the merge
includes renames to a directory non existant in the working copy. Creating those
directories makes the merge work.

I think that the handling of renames in the 'merge' operation does not handle
creating directories for those renames.

The output:
...
UPDATE tools/tool1/src/CMakeLists.txt
RENAME tools/tool1/src/lv/CMakeLists.txt -> tools/tool2/src/lv/CMakeLists.txt
/home/llbatlle/3rd/fossil/fossil: cannot open 
"/home/llbatlle/a/repo/tools/tool2/src/lv/CMakeLists.txt" for writing

Stracing, it shows it's a open(...,O_CREAT,...) call failing with ENOENT.

Tested with fossil trunk.

Regards,
Lluís.
_______________________________________________
fossil-users mailing list
[email protected]
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

Reply via email to