Fossil SCM
Style consistency change only.
Commit
e1f614f3b82a07e37ba21fbbb3581de1d3ca90f1
Parent
b9728c4aa23b802…
1 file changed
+1
-1
+1
-1
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -112,11 +112,11 @@ | ||
| 112 | 112 | |
| 113 | 113 | blob_zero(&sql); |
| 114 | 114 | blob_append_sql(&sql, |
| 115 | 115 | " SELECT blob.rid FROM blob" |
| 116 | 116 | " JOIN leaf ON blob.rid=leaf.rid" |
| 117 | - " WHERE rcvid = %d" | |
| 117 | + " WHERE rcvid=%d" | |
| 118 | 118 | " AND NOT %z", rcvid, leaf_is_closed_sql("leaf.rid")); |
| 119 | 119 | db_prepare(&q, "%s", blob_sql_text(&sql)); |
| 120 | 120 | blob_reset(&sql); |
| 121 | 121 | while( !fForkSeen && db_step(&q)==SQLITE_ROW ){ |
| 122 | 122 | int rid = db_column_int(&q, 0); |
| 123 | 123 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -112,11 +112,11 @@ | |
| 112 | |
| 113 | blob_zero(&sql); |
| 114 | blob_append_sql(&sql, |
| 115 | " SELECT blob.rid FROM blob" |
| 116 | " JOIN leaf ON blob.rid=leaf.rid" |
| 117 | " WHERE rcvid = %d" |
| 118 | " AND NOT %z", rcvid, leaf_is_closed_sql("leaf.rid")); |
| 119 | db_prepare(&q, "%s", blob_sql_text(&sql)); |
| 120 | blob_reset(&sql); |
| 121 | while( !fForkSeen && db_step(&q)==SQLITE_ROW ){ |
| 122 | int rid = db_column_int(&q, 0); |
| 123 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -112,11 +112,11 @@ | |
| 112 | |
| 113 | blob_zero(&sql); |
| 114 | blob_append_sql(&sql, |
| 115 | " SELECT blob.rid FROM blob" |
| 116 | " JOIN leaf ON blob.rid=leaf.rid" |
| 117 | " WHERE rcvid=%d" |
| 118 | " AND NOT %z", rcvid, leaf_is_closed_sql("leaf.rid")); |
| 119 | db_prepare(&q, "%s", blob_sql_text(&sql)); |
| 120 | blob_reset(&sql); |
| 121 | while( !fForkSeen && db_step(&q)==SQLITE_ROW ){ |
| 122 | int rid = db_column_int(&q, 0); |
| 123 |