I checked out the text file from the trunk branch, and ran the "fossil merge" command followed by the version number of the fork's leaf. The merge appeared to be successful since no conflicts were listed, but when I tried to commit it, I got the message "fossil: cannot do a partial commit of a merge." Doing it the other way (merging the one from the trunk into the forked leaf) got me the same result: merge had no conflicts, but Fossil cannot check it in.

Sorry if I cannot look into the underlying code, I'm no programmer. I'm using Fossil mainly for my writing projects, since it's pretty much self-contained. I hope to hear from you guys soon!

Thanks, Isxek

drh added on 2010-05-04 11:29:24:
After a merge, you need to commit the entire tree, not individual files.

fossil commit

Not

fossil commit somefile.txt