Yes, we discussed this one the list before. The fossil should at least warn about it, or more accurately raise a conflict, because that's what it really is. It's a bug.
Since we've got Richard's attention to this thread, I'd point him to related bugs that were reported before. Maybe these should be entered as tickets so we don't lose track of them. 1. (In May) Anofos reported that renaming a file on the branch and adding it back later results in lost file when merged back to trunk. Git does the right thing. http://www.mail-archive.com/fossil-users%40lists.fossil-scm.org/msg20417.html 2. (In June) Andy G reported after renaming file in a branch, merging trunk changes to it works only once, and subsequent merges do nothing: http://www.mail-archive.com/fossil-users@lists.fossil-scm.org/msg20758.html From: Scott Robison Sent: Friday, 25 September 2015 02:51 To: Fossil SCM user's discussion Reply To: Fossil SCM user's discussion Subject: Re: [fossil-users] MERGE problem Is there a chance that these are files you previously deleted from a branch? For example: 1. Create branch from trunk. 2. Deleted files from branch and committed. 3. Made changes to files on trunk and committed. 4. Merged from trunk expecting the changed files to come into branch. There are some scenarios where what you describe can legitimately happen, but in order to troubleshoot it one would have to look at the entire state of the repository to see what merge is (or is not, as the case may be) doing. On Thu, Sep 24, 2015 at 8:59 AM, Tony Papadimitriou <to...@acm.org<mailto:to...@acm.org>> wrote: I’m in some branch and doing a MERGE from trunk. Everything OK except for some newly added files on trunk that were not in the current branch, but a merge was expected to deal with them also. But, they do not ‘copy over’. The result is the project is incomplete as the updated files depend (#include) the missing ones. I can do a manual UPDATE to bring each file in the working branch from trunk ‘by hand’ but shouldn’t a MERGE take care of that also? Thanks. _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org<mailto: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
