Thus said Zakero on Sun, 16 Oct 2016 18:45:41 -0500:
> SQLITE_CONSTRAINT: abort at 41 in [INSERT INTO
> vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname) SELECT
> 21178,3,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=4735]: UNIQUE
> constraint failed: vfile.pathname, vfile.
> fossil: UNIQUE constraint failed: vfile.pathname, vfile.vid: {INSERT INTO
> vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname) SELECT
> 21178,3,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=4735}
> Rolling back prior filesystem changes...
Can you provide steps to reproduce this, or otherwise provide a link to
the Fossil so that it can be attempted by others?
From the error, it seems to be a problem with your local checkout. What
happens if you clone again from the original source, and then attempt
the merge?
Thanks,
Andy
--
TAI64 timestamp: 400000005804421e
_______________________________________________
fossil-dev mailing list
fossil-dev@mailinglists.sqlite.org
http://mailinglists.sqlite.org/cgi-bin/mailman/listinfo/fossil-dev
