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

[Richard Hipp]

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
> (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

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

[Thomas Bilk]

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.

Thanks.
Thomas.
___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

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

[Andy Bradford]

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 
> 6938,3,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=551448]: UNIQUE 
> constraint failed: vfile.pathname, vfilef: UNIQUE constraint failed: 
> vfile.pathname, vfile.vid: {INSERT INTO 
> vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname)  SELECT 
> 6938,3,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=551448}
> 

This is similar to a previously reported problem that we've been able to
narrow down to merging in file  renames that already exist on the target
branch.

Thw WARNING  is new, however,  it's likely due  to files being  added in
both  locations  but which  have  no  common  ancestors (would  need  to
verify).

Did you,  by chance, add  some files, rename  then, then merge  them and
then try to merge back?

See this thread:

http://marc.info/?t=14766615961=1=2

Thanks,

Andy
-- 
TAI64 timestamp: 400058323ef7


___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users

[fossil-users] Merge failed with SQL error

[Tony Papadimitriou]

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 
what I got (multiple WARNINGs have been collapsed to just one, and the actual 
filenames removed):

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 
6938,3,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=551448]: UNIQUE 
constraint failed: vfile.pathname, vfilef: UNIQUE constraint failed: 
vfile.pathname, vfile.vid: {INSERT INTO 
vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname)  SELECT 
6938,3,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=551448}

DB –DB-CHECK shows no problems.

(I ended up purging the commit for now because it felt like the repo may have 
gotten into an unstable state.)

Thanks.___
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users