On Wed, Sep 07, 2011 at 03:50:32PM +0200, Lluís Batlle i Rossell wrote:
> On Wed, Sep 07, 2011 at 03:06:28PM +0200, Lluís Batlle i Rossell wrote:
> > I'm doing in a branch: "fossil merge trunk", and I get (in 1.18):
> >
> > .... [many updates]
> > RENAME a.cmd -> a2.cmd
> > fossil: SQLITE_CONSTRAINT: abort at 34 in [UPDATE vfile SET
> > pathname='a2.cmd', origname=coalesce(origname,pathname) WHERE
> > id=1793175 AND vid=14998]: columns pathname, vid are not unique
> > fossil: columns pathname, vid are not unique
> > .... [many undo]
> > fossil: SQLITE_BUSY: statement aborts at 2: [ROLLBACK] cannot rollback
> > transaction - SQL statements in progress
> >
> > Any idea?
>
> Same troubles with the trunk of 1 minute ago.
So, I can add that as I had the rename on trunk, now I cannot run "fossil merge
trunk" from any branch. I've decided to branch as 'mistake' since the rename
checkin, and replay all the trunk commits after that again, cherry-picking.
Nevertheless, here is the information of "--debug" from fossil trunk:
P->M at 15956> c0224914b6: 4198[a2.cmd] -> 0[]
P->M at 15957> 9d69a325f1: 2405[a.cmd] -> 0[]
P->M at 15957> 9d69a325f1: 2405[a.cmd] ->
4198[a2.cmd]
P->M summary 2405[a.cmd] -> 4198[a2.cmd]
186: ridv=151 ridp=151 ridm=15973 chnged=0 isexe=0
fn = [a2.cmd]
fnp = [a2.cmd]
fnm = [a2.cmd]
187: ridv=14576 ridp=14576 ridm=15973 chnged=0 isexe=0
fn = [a.cmd]
fnp = [a.cmd]
fnm = [a2.cmd]
I took a look for a few minutes to the rename codes, but disturbs me that none
of the IDs outputted in the --debug match, so I don't know still how to fix
this. Or how to reproduce it in a new repository.
_______________________________________________
fossil-users mailing list
[email protected]
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
