Fossil SCM
merged 63dc0641ac
Commit
ce06c5e086a3562f79c28096f1142b702e52006d
Parent
757a5e5b4e60d4f…
1 file changed
-2
-2
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -242,12 +242,10 @@ | ||
| 242 | 242 | printf("DELETED %s\n", zPathname); |
| 243 | 243 | }else if( access(zFullName, 0) ){ |
| 244 | 244 | printf("MISSING %s\n", zPathname); |
| 245 | 245 | }else if( isNew ){ |
| 246 | 246 | printf("ADDED %s\n", zPathname); |
| 247 | - }else if( isDeleted ){ | |
| 248 | - printf("DELETED %s\n", zPathname); | |
| 249 | 247 | }else if( isChnged==3 ){ |
| 250 | 248 | printf("ADDED_BY_MERGE %s\n", zPathname); |
| 251 | 249 | }else{ |
| 252 | 250 | int srcid = db_column_int(&q, 4); |
| 253 | 251 | Blob content; |
| 254 | 252 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -242,12 +242,10 @@ | |
| 242 | printf("DELETED %s\n", zPathname); |
| 243 | }else if( access(zFullName, 0) ){ |
| 244 | printf("MISSING %s\n", zPathname); |
| 245 | }else if( isNew ){ |
| 246 | printf("ADDED %s\n", zPathname); |
| 247 | }else if( isDeleted ){ |
| 248 | printf("DELETED %s\n", zPathname); |
| 249 | }else if( isChnged==3 ){ |
| 250 | printf("ADDED_BY_MERGE %s\n", zPathname); |
| 251 | }else{ |
| 252 | int srcid = db_column_int(&q, 4); |
| 253 | Blob content; |
| 254 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -242,12 +242,10 @@ | |
| 242 | printf("DELETED %s\n", zPathname); |
| 243 | }else if( access(zFullName, 0) ){ |
| 244 | printf("MISSING %s\n", zPathname); |
| 245 | }else if( isNew ){ |
| 246 | printf("ADDED %s\n", zPathname); |
| 247 | }else if( isChnged==3 ){ |
| 248 | printf("ADDED_BY_MERGE %s\n", zPathname); |
| 249 | }else{ |
| 250 | int srcid = db_column_int(&q, 4); |
| 251 | Blob content; |
| 252 |