>From 'fossil help merge': === Only file content is merged. The result continues to use the file and directory names from the current checkout even if those names might have been changed in the branch being merged in. ===
This struck me as very odd. If the file name only changed on the branch being merged in (called "M" in the code) since the nearest common ancestor, then the file name on M should be chosen. So I did some digging. It turns out that this documentation is not correct. The code in merge.c and my own hand-testing confirm that the behavior is what you would expect. So I think the help text needs an update. And, BTW, the fact that renaming conflicts are not raised to the user (fossil silently chooses the target version's name) should probably be considered a serious bug. I skimmed through open tickets on the ticket tracker and didn't find anything open for that. I noticed a related ticket here[1], however, which I think is no longer valid and can be closed. Eric [1] http://www.fossil-scm.org/index.html/tktview?name=67176c3aa4
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
