"f merge branch-name -baseline root:branch-name" is an infinite loop for me
since Fossil change 41c2220934, as determined by bisection. Version
4d1f2d302b (latest trunk) is bad too. Execution hangs up inside SQLite.
The check-in comment for 41c2220934 is "Improve the merge command's ability
to handle various scenarios involving renames."
Here is the backtrace:
#0 0x08127109 in sqlite3VdbeExec (p=0x85c9410) at ./src/sqlite3.c:81008
#1 0x0811f64c in sqlite3Step (p=0x85c9410) at ./src/sqlite3.c:74987
#2 0x0811f7c6 in sqlite3_step (pStmt=0x85c9410) at ./src/sqlite3.c:75048
#3 0x080694ad in db_step (pStmt=0xbfffef10) at ./src/db.c:345
#4 0x08069cac in db_exists (
zSql=0x8248abc "WITH RECURSIVE ancestor(id) AS ( VALUES(%d) UNION
ALL SELECT pid FROM plink, ancestor WHERE cid=ancestor.id AND pid!=%d
AND cid!=%d)SELECT 1 FROM ancestor WHERE id=%d LIMIT 1") at ./src/db.c:622
#5 0x080a8551 in merge_cmd () at ./src/merge.c:397
#6 0x0809785b in main (argc=5, argv=0xbffff364) at ./src/main.c:804
sqlite3VdbeExec() never returns.
The repository is private, sorry, but I should be able to help with
I apologize for my several months of absence. I've been very busy working
on this and a few other projects. Today I upgraded from Fossil 1.34, and it
looks like I'm going to have to switch back.
Andy Goth | <andrew.m.goth/at/gmail/dot/com>
fossil-users mailing list