Fossil SCM
Detect subsequent edits to a file that was updated by merge. This fixes a problem introduced by check-in [b9227b85cbd78] and reported by ticket [67a47646ea38c7ed].
Commit
a932b744332916c58f0cd1f8377aa843413663c7
Parent
da94a3b1c5f181a…
1 file changed
+1
-1
+1
-1
| --- src/vfile.c | ||
| +++ src/vfile.c | ||
| @@ -190,11 +190,11 @@ | ||
| 190 | 190 | nErr++; |
| 191 | 191 | } |
| 192 | 192 | chnged = 1; |
| 193 | 193 | } |
| 194 | 194 | if( origSize!=currentSize ){ |
| 195 | - if( chnged==0 ){ | |
| 195 | + if( chnged!=1 ){ | |
| 196 | 196 | /* A file size change is definitive - the file has changed. No |
| 197 | 197 | ** need to check the mtime or sha1sum */ |
| 198 | 198 | chnged = 1; |
| 199 | 199 | } |
| 200 | 200 | }else if( chnged==1 && rid!=0 && !isDeleted ){ |
| 201 | 201 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -190,11 +190,11 @@ | |
| 190 | nErr++; |
| 191 | } |
| 192 | chnged = 1; |
| 193 | } |
| 194 | if( origSize!=currentSize ){ |
| 195 | if( chnged==0 ){ |
| 196 | /* A file size change is definitive - the file has changed. No |
| 197 | ** need to check the mtime or sha1sum */ |
| 198 | chnged = 1; |
| 199 | } |
| 200 | }else if( chnged==1 && rid!=0 && !isDeleted ){ |
| 201 |
| --- src/vfile.c | |
| +++ src/vfile.c | |
| @@ -190,11 +190,11 @@ | |
| 190 | nErr++; |
| 191 | } |
| 192 | chnged = 1; |
| 193 | } |
| 194 | if( origSize!=currentSize ){ |
| 195 | if( chnged!=1 ){ |
| 196 | /* A file size change is definitive - the file has changed. No |
| 197 | ** need to check the mtime or sha1sum */ |
| 198 | chnged = 1; |
| 199 | } |
| 200 | }else if( chnged==1 && rid!=0 && !isDeleted ){ |
| 201 |