my fossil repository has a branch which cannot be merged into another one.
Fossil: This is fossil version 1.35 [3aa86af6aa] 2016-06-14 11:10:39 UTC
I already did fossil rebuild.
This is the last line after: fossil merge -n <branch to merge>
*SQLITE_CONSTRAINT: abort at 42 in [INSERT INTO
vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname) SELECT
42158,3,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=673981]:
UNIQUE constraint failed: vfile.pathname, vfil**
**/usr/local/bin/fossil: UNIQUE constraint failed: vfile.pathname,
vfile.vid: {INSERT INTO
vfile(vid,chnged,deleted,rid,mrid,isexe,islink,pathname) SELECT
42158,3,0,rid,mrid,isexe,islink,pathname FROM vfile WHERE id=673981}**
*
Google point me to some renaming issues, which I did. But no idea how to
fix this.
Any Idea to fix this.
Thank you very much.
--
------------------------------------------------------------------------
Get a first impression of our solution ----
http://engineering.amitego.com/youtube/gaincontrol.htm
------------------------------------------------------------------------
*amitego engineering GmbH*
CEO/CTO Tillmann A. Basien
Balinger Straße 37A
D-70567 Stuttgart
Fon: +49 (0) 711 78 78 166-0
Hy : +49 (0) 173 87 38 987
*** Oracle Gold Partner ***
mailto:[email protected] / http://engineering.amitego.com HRB: 23711
This message and any files or documents attached are strictly
confidential or otherwise legally protected. It is intended only for the
individual or entity named. If you are not the named addressee or have
received this email in error, please inform the sender immediately,
delete it from your system and do not copy or disclose it or use it for
any purpose. Please also note that transmission cannot be guaranteed to
be secure or error-free.
_______________________________________________
fossil-users mailing list
[email protected]
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
