Re: [fossil-users] Merge failed with SQL error

On 12/18/16, Thomas Bilk 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 >

Re: [fossil-users] Merge failed with SQL error

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

Re: [fossil-users] Merge failed with SQL error

Thus said "Tony Papadimitriou" on Sun, 20 Nov 2016 16:32:02 +0200: > c:\temp>f me trunk > WARNING: no common ancestor for ...several_files... > SQLITE_CONSTRAINT: abort at 45 in [INSERT INTO > vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname) SELECT >

[fossil-users] Merge failed with SQL error

Just to report some unexpected problem that happened today. After adding (ADD command) some files to trunk that where already part of a different branch, and committing, I went to the other branch in question (with UPDATE) and tried to MERGE trunk to include some other changes as well. Here’s