Differences From Artifact [c5fdb35c64]:
- File src/json_status.c — part of check-in [967ef5f7c5] at 2013-07-14 14:56:07 on branch merge-integrate — Rebase. Use -4 as INTEGRATE tag, not -3 (user: jan.nijtmans size: 5328) [more...]
To Artifact [c38b2e5181]:
- File src/json_status.c — part of check-in [1dc3881129] at 2013-08-26 11:56:35 on branch trunk — Update json status page for "merge --integrate" (user: jan.nijtmans size: 5460) [more...]
| ︙ | |||
124 125 126 127 128 129 130 131 132 133 134 135 136 137 | 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 | + + + + |
zStatus = "missing";
++nErr;
}
}else if( 2==isChnged ){
zStatus = "updatedByMerge";
}else if( 3==isChnged ){
zStatus = "addedByMerge";
}else if( 4==isChnged ){
zStatus = "updatedByIntegrate";
}else if( 5==isChnged ){
zStatus = "addedByIntegrate";
}else if( 1==isChnged ){
if( file_contains_merge_marker(zFullName) ){
zStatus = "conflict";
}else{
zStatus = "edited";
}
}
|
| ︙ |