Fossil SCM
Possible fix for lockup on merge with rename and (maybe?) custom baseline (exact reasons for lockup not 100% known), resolves issue with my (private) repository. Change received from drh via mailing list. See http://www.mail-archive.com/[email protected]/msg23838.html for details.
Commit
0120be34ea8b8599302329667c1b0cfb08116087
Parent
4d1f2d302b6727a…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -395,11 +395,11 @@ | ||
| 395 | 395 | } |
| 396 | 396 | if( zPivot ){ |
| 397 | 397 | vAncestor = db_exists( |
| 398 | 398 | "WITH RECURSIVE ancestor(id) AS (" |
| 399 | 399 | " VALUES(%d)" |
| 400 | - " UNION ALL" | |
| 400 | + " UNION" | |
| 401 | 401 | " SELECT pid FROM plink, ancestor" |
| 402 | 402 | " WHERE cid=ancestor.id AND pid!=%d AND cid!=%d)" |
| 403 | 403 | "SELECT 1 FROM ancestor WHERE id=%d LIMIT 1", |
| 404 | 404 | vid, nid, pid, pid |
| 405 | 405 | ) ? 'p' : 'n'; |
| 406 | 406 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -395,11 +395,11 @@ | |
| 395 | } |
| 396 | if( zPivot ){ |
| 397 | vAncestor = db_exists( |
| 398 | "WITH RECURSIVE ancestor(id) AS (" |
| 399 | " VALUES(%d)" |
| 400 | " UNION ALL" |
| 401 | " SELECT pid FROM plink, ancestor" |
| 402 | " WHERE cid=ancestor.id AND pid!=%d AND cid!=%d)" |
| 403 | "SELECT 1 FROM ancestor WHERE id=%d LIMIT 1", |
| 404 | vid, nid, pid, pid |
| 405 | ) ? 'p' : 'n'; |
| 406 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -395,11 +395,11 @@ | |
| 395 | } |
| 396 | if( zPivot ){ |
| 397 | vAncestor = db_exists( |
| 398 | "WITH RECURSIVE ancestor(id) AS (" |
| 399 | " VALUES(%d)" |
| 400 | " UNION" |
| 401 | " SELECT pid FROM plink, ancestor" |
| 402 | " WHERE cid=ancestor.id AND pid!=%d AND cid!=%d)" |
| 403 | "SELECT 1 FROM ancestor WHERE id=%d LIMIT 1", |
| 404 | vid, nid, pid, pid |
| 405 | ) ? 'p' : 'n'; |
| 406 |