On Sun, Sep 27, 2015 at 1:40 AM, <to...@acm.org> wrote: > 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. >
I cannot reproduce this (which does not mean the problem does not exist, just that trying it as I read the description does not result in anything unexpected\). 1. create a new empty repo (with initial empty checkin built from commit 65ff0ab281). 2. add a new file a to trunk and commit trunk. 3. commit to new branch other allow empty. 4. add new file b to trunk. 5. modify file a on trunk 6. commit 7. update to other 8. add file a to other & commit. 9. merge from trunk, a is modified, b is added, commit other 10. update to trunk 11. add file d to trunk & commit. 12. Repeat 23 times 12a. Modify file a on trunk 12b. commit 13. update to other 14. merge from trunk, a is modified, d is added, commit other Given something like this as a template, is it possible for you to create the same problem with a test repository? > > 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 > > -- Scott Robison
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
