Fossil SCM
When reporting the status of a file, DELETED takes prescedence over MISSING. Ticket [94a1f83f9f07dda21d8e3b].
Commit
f163faf128d36c7f1f59ca77c62207c12046e792
Parent
f4ab459430b2f82…
1 file changed
+3
-3
+3
-3
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -83,11 +83,13 @@ | ||
| 83 | 83 | if( zDisplayName[0]=='.' && zDisplayName[1]=='/' ){ |
| 84 | 84 | zDisplayName += 2; /* no unnecessary ./ prefix */ |
| 85 | 85 | } |
| 86 | 86 | } |
| 87 | 87 | blob_append(report, zPrefix, nPrefix); |
| 88 | - if( !file_wd_isfile_or_link(zFullName) ){ | |
| 88 | + if( isDeleted ){ | |
| 89 | + blob_appendf(report, "DELETED %s\n", zDisplayName); | |
| 90 | + }else if( !file_wd_isfile_or_link(zFullName) ){ | |
| 89 | 91 | if( file_access(zFullName, F_OK)==0 ){ |
| 90 | 92 | blob_appendf(report, "NOT_A_FILE %s\n", zDisplayName); |
| 91 | 93 | if( missingIsFatal ){ |
| 92 | 94 | fossil_warning("not a file: %s", zDisplayName); |
| 93 | 95 | nErr++; |
| @@ -99,12 +101,10 @@ | ||
| 99 | 101 | nErr++; |
| 100 | 102 | } |
| 101 | 103 | } |
| 102 | 104 | }else if( isNew ){ |
| 103 | 105 | blob_appendf(report, "ADDED %s\n", zDisplayName); |
| 104 | - }else if( isDeleted ){ | |
| 105 | - blob_appendf(report, "DELETED %s\n", zDisplayName); | |
| 106 | 106 | }else if( isChnged ){ |
| 107 | 107 | if( isChnged==2 ){ |
| 108 | 108 | blob_appendf(report, "UPDATED_BY_MERGE %s\n", zDisplayName); |
| 109 | 109 | }else if( isChnged==3 ){ |
| 110 | 110 | blob_appendf(report, "ADDED_BY_MERGE %s\n", zDisplayName); |
| 111 | 111 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -83,11 +83,13 @@ | |
| 83 | if( zDisplayName[0]=='.' && zDisplayName[1]=='/' ){ |
| 84 | zDisplayName += 2; /* no unnecessary ./ prefix */ |
| 85 | } |
| 86 | } |
| 87 | blob_append(report, zPrefix, nPrefix); |
| 88 | if( !file_wd_isfile_or_link(zFullName) ){ |
| 89 | if( file_access(zFullName, F_OK)==0 ){ |
| 90 | blob_appendf(report, "NOT_A_FILE %s\n", zDisplayName); |
| 91 | if( missingIsFatal ){ |
| 92 | fossil_warning("not a file: %s", zDisplayName); |
| 93 | nErr++; |
| @@ -99,12 +101,10 @@ | |
| 99 | nErr++; |
| 100 | } |
| 101 | } |
| 102 | }else if( isNew ){ |
| 103 | blob_appendf(report, "ADDED %s\n", zDisplayName); |
| 104 | }else if( isDeleted ){ |
| 105 | blob_appendf(report, "DELETED %s\n", zDisplayName); |
| 106 | }else if( isChnged ){ |
| 107 | if( isChnged==2 ){ |
| 108 | blob_appendf(report, "UPDATED_BY_MERGE %s\n", zDisplayName); |
| 109 | }else if( isChnged==3 ){ |
| 110 | blob_appendf(report, "ADDED_BY_MERGE %s\n", zDisplayName); |
| 111 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -83,11 +83,13 @@ | |
| 83 | if( zDisplayName[0]=='.' && zDisplayName[1]=='/' ){ |
| 84 | zDisplayName += 2; /* no unnecessary ./ prefix */ |
| 85 | } |
| 86 | } |
| 87 | blob_append(report, zPrefix, nPrefix); |
| 88 | if( isDeleted ){ |
| 89 | blob_appendf(report, "DELETED %s\n", zDisplayName); |
| 90 | }else if( !file_wd_isfile_or_link(zFullName) ){ |
| 91 | if( file_access(zFullName, F_OK)==0 ){ |
| 92 | blob_appendf(report, "NOT_A_FILE %s\n", zDisplayName); |
| 93 | if( missingIsFatal ){ |
| 94 | fossil_warning("not a file: %s", zDisplayName); |
| 95 | nErr++; |
| @@ -99,12 +101,10 @@ | |
| 101 | nErr++; |
| 102 | } |
| 103 | } |
| 104 | }else if( isNew ){ |
| 105 | blob_appendf(report, "ADDED %s\n", zDisplayName); |
| 106 | }else if( isChnged ){ |
| 107 | if( isChnged==2 ){ |
| 108 | blob_appendf(report, "UPDATED_BY_MERGE %s\n", zDisplayName); |
| 109 | }else if( isChnged==3 ){ |
| 110 | blob_appendf(report, "ADDED_BY_MERGE %s\n", zDisplayName); |
| 111 |