Fossil SCM
Simplifications to the SQL that determines a fork to merge when the "fossil merge" command has no VERSION argument.
Commit
8a470fd4bca8a81c67503bc0aba61a932c4de4ef
Parent
9ee47de25474d70…
1 file changed
+4
-9
+4
-9
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -173,26 +173,21 @@ | ||
| 173 | 173 | " AND NOT EXISTS(SELECT 1 FROM tagxref" /* Constraint (3) */ |
| 174 | 174 | " WHERE rid=leaf.rid" |
| 175 | 175 | " AND tagid=%d" |
| 176 | 176 | " AND tagtype>0)" |
| 177 | 177 | " AND (SELECT value FROM tagxref" /* Constraint (4) */ |
| 178 | - " WHERE tagid=%d AND rid=%d" | |
| 179 | - " AND tagtype>0" | |
| 180 | - " ORDER BY mtime DESC LIMIT 1) = " | |
| 178 | + " WHERE tagid=%d AND rid=%d AND tagtype>0) =" | |
| 181 | 179 | " (SELECT value FROM tagxref" |
| 182 | - " WHERE tagid=%d AND rid=leaf.rid" | |
| 183 | - " AND tagtype>0" | |
| 184 | - " ORDER BY mtime DESC LIMIT 1)" | |
| 180 | + " WHERE tagid=%d AND rid=leaf.rid AND tagtype>0)" | |
| 185 | 181 | " ORDER BY event.mtime DESC LIMIT 1", |
| 186 | 182 | vid, TAG_CLOSED, TAG_BRANCH, vid, TAG_BRANCH |
| 187 | 183 | ); |
| 188 | 184 | if( mid==0 ){ |
| 189 | 185 | fossil_fatal("no unmerged forks of branch \"%s\"", |
| 190 | 186 | db_text(0, "SELECT value FROM tagxref" |
| 191 | - " WHERE tagid=%d AND rid=%d" | |
| 192 | - " AND tagtype>0" | |
| 193 | - " ORDER BY mtime DESC LIMIT 1", TAG_BRANCH, vid) | |
| 187 | + " WHERE tagid=%d AND rid=%d AND tagtype>0", | |
| 188 | + TAG_BRANCH, vid) | |
| 194 | 189 | ); |
| 195 | 190 | } |
| 196 | 191 | db_prepare(&q, |
| 197 | 192 | "SELECT blob.uuid," |
| 198 | 193 | " datetime(event.mtime,'localtime')," |
| 199 | 194 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -173,26 +173,21 @@ | |
| 173 | " AND NOT EXISTS(SELECT 1 FROM tagxref" /* Constraint (3) */ |
| 174 | " WHERE rid=leaf.rid" |
| 175 | " AND tagid=%d" |
| 176 | " AND tagtype>0)" |
| 177 | " AND (SELECT value FROM tagxref" /* Constraint (4) */ |
| 178 | " WHERE tagid=%d AND rid=%d" |
| 179 | " AND tagtype>0" |
| 180 | " ORDER BY mtime DESC LIMIT 1) = " |
| 181 | " (SELECT value FROM tagxref" |
| 182 | " WHERE tagid=%d AND rid=leaf.rid" |
| 183 | " AND tagtype>0" |
| 184 | " ORDER BY mtime DESC LIMIT 1)" |
| 185 | " ORDER BY event.mtime DESC LIMIT 1", |
| 186 | vid, TAG_CLOSED, TAG_BRANCH, vid, TAG_BRANCH |
| 187 | ); |
| 188 | if( mid==0 ){ |
| 189 | fossil_fatal("no unmerged forks of branch \"%s\"", |
| 190 | db_text(0, "SELECT value FROM tagxref" |
| 191 | " WHERE tagid=%d AND rid=%d" |
| 192 | " AND tagtype>0" |
| 193 | " ORDER BY mtime DESC LIMIT 1", TAG_BRANCH, vid) |
| 194 | ); |
| 195 | } |
| 196 | db_prepare(&q, |
| 197 | "SELECT blob.uuid," |
| 198 | " datetime(event.mtime,'localtime')," |
| 199 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -173,26 +173,21 @@ | |
| 173 | " AND NOT EXISTS(SELECT 1 FROM tagxref" /* Constraint (3) */ |
| 174 | " WHERE rid=leaf.rid" |
| 175 | " AND tagid=%d" |
| 176 | " AND tagtype>0)" |
| 177 | " AND (SELECT value FROM tagxref" /* Constraint (4) */ |
| 178 | " WHERE tagid=%d AND rid=%d AND tagtype>0) =" |
| 179 | " (SELECT value FROM tagxref" |
| 180 | " WHERE tagid=%d AND rid=leaf.rid AND tagtype>0)" |
| 181 | " ORDER BY event.mtime DESC LIMIT 1", |
| 182 | vid, TAG_CLOSED, TAG_BRANCH, vid, TAG_BRANCH |
| 183 | ); |
| 184 | if( mid==0 ){ |
| 185 | fossil_fatal("no unmerged forks of branch \"%s\"", |
| 186 | db_text(0, "SELECT value FROM tagxref" |
| 187 | " WHERE tagid=%d AND rid=%d AND tagtype>0", |
| 188 | TAG_BRANCH, vid) |
| 189 | ); |
| 190 | } |
| 191 | db_prepare(&q, |
| 192 | "SELECT blob.uuid," |
| 193 | " datetime(event.mtime,'localtime')," |
| 194 |