Fossil SCM
Avoid misinterpretation of operator.
Commit
bfdc38243fc1b6cb07a1db4ea15ac12a99c75d7e
Parent
28a24c4ba6bdbec…
1 file changed
+4
-2
+4
-2
| --- src/merge.c | ||
| +++ src/merge.c | ||
| @@ -273,12 +273,14 @@ | ||
| 273 | 273 | print_checkin_description(pid, 12, "baseline:"); |
| 274 | 274 | } |
| 275 | 275 | vfile_check_signature(vid, CKSIG_ENOTFILE); |
| 276 | 276 | db_begin_transaction(); |
| 277 | 277 | if( !dryRunFlag ) undo_begin(); |
| 278 | - if( ( load_vfile_from_rid(mid) | load_vfile_from_rid(pid) )!=0 | |
| 279 | - && !forceMissingFlag ){ | |
| 278 | + if( load_vfile_from_rid(mid) && !forceMissingFlag ){ | |
| 279 | + fossil_fatal("missing content, unable to merge"); | |
| 280 | + } | |
| 281 | + if( load_vfile_from_rid(pid) && !forceMissingFlag ){ | |
| 280 | 282 | fossil_fatal("missing content, unable to merge"); |
| 281 | 283 | } |
| 282 | 284 | if( debugFlag ){ |
| 283 | 285 | char *z; |
| 284 | 286 | z = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", pid); |
| 285 | 287 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -273,12 +273,14 @@ | |
| 273 | print_checkin_description(pid, 12, "baseline:"); |
| 274 | } |
| 275 | vfile_check_signature(vid, CKSIG_ENOTFILE); |
| 276 | db_begin_transaction(); |
| 277 | if( !dryRunFlag ) undo_begin(); |
| 278 | if( ( load_vfile_from_rid(mid) | load_vfile_from_rid(pid) )!=0 |
| 279 | && !forceMissingFlag ){ |
| 280 | fossil_fatal("missing content, unable to merge"); |
| 281 | } |
| 282 | if( debugFlag ){ |
| 283 | char *z; |
| 284 | z = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", pid); |
| 285 |
| --- src/merge.c | |
| +++ src/merge.c | |
| @@ -273,12 +273,14 @@ | |
| 273 | print_checkin_description(pid, 12, "baseline:"); |
| 274 | } |
| 275 | vfile_check_signature(vid, CKSIG_ENOTFILE); |
| 276 | db_begin_transaction(); |
| 277 | if( !dryRunFlag ) undo_begin(); |
| 278 | if( load_vfile_from_rid(mid) && !forceMissingFlag ){ |
| 279 | fossil_fatal("missing content, unable to merge"); |
| 280 | } |
| 281 | if( load_vfile_from_rid(pid) && !forceMissingFlag ){ |
| 282 | fossil_fatal("missing content, unable to merge"); |
| 283 | } |
| 284 | if( debugFlag ){ |
| 285 | char *z; |
| 286 | z = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", pid); |
| 287 |