Thus said Zakero on Thu, 22 Dec 2016 16:07:52 +0400: > A few weeks ago, Andy asked me to try to reproduce > this problem with older versions of fossil. The check-in > "41c2220934de8cb8d90126d5083df3e95e961b8c" is where the problem first > appears. This also mirrors the findings in the "Merge failed with SQL > error" email in the fossil-users mailing list that states the problem > seems related to the "merge-renames" branch.
It looks like Richard found some time to fix this: http://www.fossil-scm.org/index.html/info/0df5249d51b9c49a I've updated the test case (which was failing due to some output changes, but which are actually correct). Please try building the latest on trunk to see if it will correctly merge your branch. I would try myself, but I deleted the copy of your repository that I was testing against. Thanks, Andy -- TAI64 timestamp: 400000005864051a _______________________________________________ fossil-dev mailing list [email protected] http://mailinglists.sqlite.org/cgi-bin/mailman/listinfo/fossil-dev
