Fossil SCM
Update json status page for "merge --integrate"
Commit
1dc3881129c85d7791871e54bb574b1367f291e0
Parent
512cc1977a40adf…
1 file changed
+4
+4
| --- src/json_status.c | ||
| +++ src/json_status.c | ||
| @@ -126,10 +126,14 @@ | ||
| 126 | 126 | } |
| 127 | 127 | }else if( 2==isChnged ){ |
| 128 | 128 | zStatus = "updatedByMerge"; |
| 129 | 129 | }else if( 3==isChnged ){ |
| 130 | 130 | zStatus = "addedByMerge"; |
| 131 | + }else if( 4==isChnged ){ | |
| 132 | + zStatus = "updatedByIntegrate"; | |
| 133 | + }else if( 5==isChnged ){ | |
| 134 | + zStatus = "addedByIntegrate"; | |
| 131 | 135 | }else if( 1==isChnged ){ |
| 132 | 136 | if( file_contains_merge_marker(zFullName) ){ |
| 133 | 137 | zStatus = "conflict"; |
| 134 | 138 | }else{ |
| 135 | 139 | zStatus = "edited"; |
| 136 | 140 |
| --- src/json_status.c | |
| +++ src/json_status.c | |
| @@ -126,10 +126,14 @@ | |
| 126 | } |
| 127 | }else if( 2==isChnged ){ |
| 128 | zStatus = "updatedByMerge"; |
| 129 | }else if( 3==isChnged ){ |
| 130 | zStatus = "addedByMerge"; |
| 131 | }else if( 1==isChnged ){ |
| 132 | if( file_contains_merge_marker(zFullName) ){ |
| 133 | zStatus = "conflict"; |
| 134 | }else{ |
| 135 | zStatus = "edited"; |
| 136 |
| --- src/json_status.c | |
| +++ src/json_status.c | |
| @@ -126,10 +126,14 @@ | |
| 126 | } |
| 127 | }else if( 2==isChnged ){ |
| 128 | zStatus = "updatedByMerge"; |
| 129 | }else if( 3==isChnged ){ |
| 130 | zStatus = "addedByMerge"; |
| 131 | }else if( 4==isChnged ){ |
| 132 | zStatus = "updatedByIntegrate"; |
| 133 | }else if( 5==isChnged ){ |
| 134 | zStatus = "addedByIntegrate"; |
| 135 | }else if( 1==isChnged ){ |
| 136 | if( file_contains_merge_marker(zFullName) ){ |
| 137 | zStatus = "conflict"; |
| 138 | }else{ |
| 139 | zStatus = "edited"; |
| 140 |