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=147666159600001&r=1&w=2
Thanks,
Andy
--
TAI64 timestamp: 4000000058323ef7
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
