Re the failing merge tests you discuss: * merge_multi-4 * merge_renames-5
... do you know if they are in any way related to previosly reported rename bugs below? Second one, in particular, makes code reorganisation painful. Cheers, Steve 1. (In May 2015) 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 _______________________________________________ fossil-dev mailing list fossil-dev@mailinglists.sqlite.org http://mailinglists.sqlite.org/cgi-bin/mailman/listinfo/fossil-dev
