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
