Fossil SCM
Fixed a && which was supposed to be a & in the new patch code. Caught by gcc.
Commit
1fd69610056205ca9b6265bb5c82bb17616b6c5b317ff560a088ebb0be20f041
Parent
3fec387cc3a0fff…
1 file changed
+4
-4
+4
-4
| --- src/patch.c | ||
| +++ src/patch.c | ||
| @@ -715,12 +715,12 @@ | ||
| 715 | 715 | Stmt q; |
| 716 | 716 | Blob empty; |
| 717 | 717 | blob_zero(&empty); |
| 718 | 718 | |
| 719 | 719 | if( (mFlags & PATCH_FORCE)==0 ){ |
| 720 | - /* Check to ensure that the patch against the repository that we | |
| 721 | - ** have opened. | |
| 720 | + /* Check to ensure that the patch is against the repository that | |
| 721 | + ** we have opened. | |
| 722 | 722 | ** |
| 723 | 723 | ** To do: If there is a mismatch, should we scan all of the repositories |
| 724 | 724 | ** listed in the global_config table looking for a match? |
| 725 | 725 | */ |
| 726 | 726 | if( db_exists( |
| @@ -771,13 +771,13 @@ | ||
| 771 | 771 | if( db_column_type(&q,0)!=SQLITE_INTEGER |
| 772 | 772 | && db_column_type(&q,4)==SQLITE_TEXT |
| 773 | 773 | ){ |
| 774 | 774 | char *zUuid = fossil_strdup(db_column_text(&q,4)); |
| 775 | 775 | char *zName = fossil_strdup(db_column_text(&q,1)); |
| 776 | - if( mFlags && PATCH_FORCE ){ | |
| 776 | + if( mFlags & PATCH_FORCE ){ | |
| 777 | 777 | fossil_print("ERROR cannot find base artifact %S for file \"%s\"\n", |
| 778 | - zUuid, zName); | |
| 778 | + zUuid, zName); | |
| 779 | 779 | nErr++; |
| 780 | 780 | fossil_free(zUuid); |
| 781 | 781 | fossil_free(zName); |
| 782 | 782 | continue; |
| 783 | 783 | }else{ |
| 784 | 784 |
| --- src/patch.c | |
| +++ src/patch.c | |
| @@ -715,12 +715,12 @@ | |
| 715 | Stmt q; |
| 716 | Blob empty; |
| 717 | blob_zero(&empty); |
| 718 | |
| 719 | if( (mFlags & PATCH_FORCE)==0 ){ |
| 720 | /* Check to ensure that the patch against the repository that we |
| 721 | ** have opened. |
| 722 | ** |
| 723 | ** To do: If there is a mismatch, should we scan all of the repositories |
| 724 | ** listed in the global_config table looking for a match? |
| 725 | */ |
| 726 | if( db_exists( |
| @@ -771,13 +771,13 @@ | |
| 771 | if( db_column_type(&q,0)!=SQLITE_INTEGER |
| 772 | && db_column_type(&q,4)==SQLITE_TEXT |
| 773 | ){ |
| 774 | char *zUuid = fossil_strdup(db_column_text(&q,4)); |
| 775 | char *zName = fossil_strdup(db_column_text(&q,1)); |
| 776 | if( mFlags && PATCH_FORCE ){ |
| 777 | fossil_print("ERROR cannot find base artifact %S for file \"%s\"\n", |
| 778 | zUuid, zName); |
| 779 | nErr++; |
| 780 | fossil_free(zUuid); |
| 781 | fossil_free(zName); |
| 782 | continue; |
| 783 | }else{ |
| 784 |
| --- src/patch.c | |
| +++ src/patch.c | |
| @@ -715,12 +715,12 @@ | |
| 715 | Stmt q; |
| 716 | Blob empty; |
| 717 | blob_zero(&empty); |
| 718 | |
| 719 | if( (mFlags & PATCH_FORCE)==0 ){ |
| 720 | /* Check to ensure that the patch is against the repository that |
| 721 | ** we have opened. |
| 722 | ** |
| 723 | ** To do: If there is a mismatch, should we scan all of the repositories |
| 724 | ** listed in the global_config table looking for a match? |
| 725 | */ |
| 726 | if( db_exists( |
| @@ -771,13 +771,13 @@ | |
| 771 | if( db_column_type(&q,0)!=SQLITE_INTEGER |
| 772 | && db_column_type(&q,4)==SQLITE_TEXT |
| 773 | ){ |
| 774 | char *zUuid = fossil_strdup(db_column_text(&q,4)); |
| 775 | char *zName = fossil_strdup(db_column_text(&q,1)); |
| 776 | if( mFlags & PATCH_FORCE ){ |
| 777 | fossil_print("ERROR cannot find base artifact %S for file \"%s\"\n", |
| 778 | zUuid, zName); |
| 779 | nErr++; |
| 780 | fossil_free(zUuid); |
| 781 | fossil_free(zName); |
| 782 | continue; |
| 783 | }else{ |
| 784 |