On 12/18/16, Thomas Bilk <tho...@bilkfamilie.de> wrote: > I have had the same issue with a merge with versions 1.35, 1.36 and a > recent trunk build. I finally managed to merge my branches with > version 1.34 of Fossil. So I guess the problem might stem from the > `merge-renames` branch > (http://fossil-scm.org/index.html/timeline?t=merge-renames), that > happened in May 2016. > > What's odd is that my merge did not contain any renames. However > before I had the SQLITE_CONSTRAINT error, the merge tried to delete a > file that existed in both branches. > > I guess I can offer access to the afflicted repository if someone > wants to peek into it. >
I won't have an opportunity work on this until Thursday. But I'd like to have a look then, if you can send the repo via private email (or some other mechanism). -- D. Richard Hipp d...@sqlite.org _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
