Fossil SCM
A rename disallows further merges
Open
032c86d6b8e1b92…
· opened 14 years, 7 months ago
- Type
- Code_Defect
- Priority
- —
- Severity
- —
- Resolution
- Open
- Subsystem
- —
- Created
- Sept. 7, 2011 2:28 p.m.
Ticket for the trouble described at [http://www.mail-archive.com/[email protected]/msg05786.html]
Error:
.... [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
Running with "merge --debug 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]
dmitry added on 2011-09-08 22:41:38 UTC: Related to [77ab05a0e9]?
dmitry added on 2011-09-08 23:13:03 UTC: Also [7e0e4755c6].