I’ve been reading much of this discussion so far, and although it has focused primarily on the possibility of a deleted file not merging in as one may have expected, I have to say that my report was not about that.
What I reported had to do with the addition of new files in trunk that were never present in the other branch, then merging trunk from the other branch does not bring in the newly added files. By newly added, I don’t mean in the last commit. It may have been tens of commits earlier but they are new in relation to the other branch which is updated much less frequently. Unfortunately, I cannot provide the repo for examination. Anyway, I finally manually updated the files and went on with life. But, I’m sure there is a bug somewhere in that behavior I’ve seen, and it’s certainly not related to files being deleted from either branch. BTW, irrelevant to my particular case, but I would expect any addition a file (even after that file had been deleted in previous check-ins) to be seen as a new file, because that’s what it really is. So, delete or no delete, a newly introduced (or re-introduced) file should be merged because it is wanted change. Thanks.
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
