Fossil SCM
Skip diff for files that are ADDED_BY_INTEGRATE.
Commit
a6b999ce131c0f17c4c1e3350f5aa97db4a268f0
Parent
26d903de0c1f17f…
1 file changed
+4
+4
| --- src/diffcmd.c | ||
| +++ src/diffcmd.c | ||
| @@ -400,10 +400,14 @@ | ||
| 400 | 400 | srcid = 0; |
| 401 | 401 | if( !asNewFile ){ showDiff = 0; } |
| 402 | 402 | }else if( isChnged==3 ){ |
| 403 | 403 | fossil_print("ADDED_BY_MERGE %s\n", zPathname); |
| 404 | 404 | srcid = 0; |
| 405 | + if( !asNewFile ){ showDiff = 0; } | |
| 406 | + }else if( isChnged==5 ){ | |
| 407 | + fossil_print("ADDED_BY_INTEGRATE %s\n", zPathname); | |
| 408 | + srcid = 0; | |
| 405 | 409 | if( !asNewFile ){ showDiff = 0; } |
| 406 | 410 | } |
| 407 | 411 | if( showDiff ){ |
| 408 | 412 | Blob content; |
| 409 | 413 | int isBin; |
| 410 | 414 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -400,10 +400,14 @@ | |
| 400 | srcid = 0; |
| 401 | if( !asNewFile ){ showDiff = 0; } |
| 402 | }else if( isChnged==3 ){ |
| 403 | fossil_print("ADDED_BY_MERGE %s\n", zPathname); |
| 404 | srcid = 0; |
| 405 | if( !asNewFile ){ showDiff = 0; } |
| 406 | } |
| 407 | if( showDiff ){ |
| 408 | Blob content; |
| 409 | int isBin; |
| 410 |
| --- src/diffcmd.c | |
| +++ src/diffcmd.c | |
| @@ -400,10 +400,14 @@ | |
| 400 | srcid = 0; |
| 401 | if( !asNewFile ){ showDiff = 0; } |
| 402 | }else if( isChnged==3 ){ |
| 403 | fossil_print("ADDED_BY_MERGE %s\n", zPathname); |
| 404 | srcid = 0; |
| 405 | if( !asNewFile ){ showDiff = 0; } |
| 406 | }else if( isChnged==5 ){ |
| 407 | fossil_print("ADDED_BY_INTEGRATE %s\n", zPathname); |
| 408 | srcid = 0; |
| 409 | if( !asNewFile ){ showDiff = 0; } |
| 410 | } |
| 411 | if( showDiff ){ |
| 412 | Blob content; |
| 413 | int isBin; |
| 414 |