Fossil SCM
Avoid listing added files when running "fossil changes -edited"
Commit
0dea016de15dc56af34558d392fe926338b1e2ce
Parent
42d6c86fa1f2077…
1 file changed
+4
-2
+4
-2
| --- src/checkin.c | ||
| +++ src/checkin.c | ||
| @@ -235,12 +235,14 @@ | ||
| 235 | 235 | if( flags & C_FATAL ){ |
| 236 | 236 | fossil_warning("missing file: %s", zFullName); |
| 237 | 237 | nErr++; |
| 238 | 238 | } |
| 239 | 239 | } |
| 240 | - }else if( (flags & C_ADDED) && isNew ){ | |
| 241 | - zClass = "ADDED"; | |
| 240 | + }else if( isNew ){ | |
| 241 | + if( flags & C_ADDED ){ | |
| 242 | + zClass = "ADDED"; | |
| 243 | + } | |
| 242 | 244 | }else if( (flags & (C_UPDATED | C_CHANGED)) && isChnged==2 ){ |
| 243 | 245 | zClass = "UPDATED_BY_MERGE"; |
| 244 | 246 | }else if( (flags & C_ADDED) && isChnged==3 ){ |
| 245 | 247 | zClass = "ADDED_BY_MERGE"; |
| 246 | 248 | }else if( (flags & (C_UPDATED | C_CHANGED)) && isChnged==4 ){ |
| 247 | 249 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -235,12 +235,14 @@ | |
| 235 | if( flags & C_FATAL ){ |
| 236 | fossil_warning("missing file: %s", zFullName); |
| 237 | nErr++; |
| 238 | } |
| 239 | } |
| 240 | }else if( (flags & C_ADDED) && isNew ){ |
| 241 | zClass = "ADDED"; |
| 242 | }else if( (flags & (C_UPDATED | C_CHANGED)) && isChnged==2 ){ |
| 243 | zClass = "UPDATED_BY_MERGE"; |
| 244 | }else if( (flags & C_ADDED) && isChnged==3 ){ |
| 245 | zClass = "ADDED_BY_MERGE"; |
| 246 | }else if( (flags & (C_UPDATED | C_CHANGED)) && isChnged==4 ){ |
| 247 |
| --- src/checkin.c | |
| +++ src/checkin.c | |
| @@ -235,12 +235,14 @@ | |
| 235 | if( flags & C_FATAL ){ |
| 236 | fossil_warning("missing file: %s", zFullName); |
| 237 | nErr++; |
| 238 | } |
| 239 | } |
| 240 | }else if( isNew ){ |
| 241 | if( flags & C_ADDED ){ |
| 242 | zClass = "ADDED"; |
| 243 | } |
| 244 | }else if( (flags & (C_UPDATED | C_CHANGED)) && isChnged==2 ){ |
| 245 | zClass = "UPDATED_BY_MERGE"; |
| 246 | }else if( (flags & C_ADDED) && isChnged==3 ){ |
| 247 | zClass = "ADDED_BY_MERGE"; |
| 248 | }else if( (flags & (C_UPDATED | C_CHANGED)) && isChnged==4 ){ |
| 249 |