Fossil SCM
Update (json status) docs for [771e592b4c59].
Commit
2868a0ec4c6f8545d1bdfb8bee05ba0b3a2d95d99f06a10a8ec9ab28b4760974
Parent
771e592b4c59ad5…
1 file changed
+7
| --- www/json-api/api-checkout.md | ||
| +++ www/json-api/api-checkout.md | ||
| @@ -39,7 +39,14 @@ | ||
| 39 | 39 | - The `checkout.tags` property follows the framework-wide convention |
| 40 | 40 | that the first tag in the list is the primary branch and any others |
| 41 | 41 | are secondary. |
| 42 | 42 | - `errorCount` is +1 for each missing file. Conflicts are not treated as |
| 43 | 43 | errors because the CLI 'status' command does not treat them as such. |
| 44 | +- The `"status"` entry for each of the `"files"` entries will be either a | |
| 45 | + single string containing a single description of the status change, or | |
| 46 | + an array of strings if more than one change was made, e.g. `"edited"` | |
| 47 | + and `"renamed"`. The status strings include:\ | |
| 48 | + `deleted`, `new`, `notAFile`, `missing`, `updatedByMerge`, | |
| 49 | + `updatedByIntegrate`, `addedBymerge`, `addedByIntegrate`, | |
| 50 | + `conflict`, `edited`, `renamed` | |
| 44 | 51 | - TODO: Info for the parent version is currently missing. |
| 45 | 52 | - TODO: "merged with" info for the checkout is currently missing. |
| 46 | 53 |
| --- www/json-api/api-checkout.md | |
| +++ www/json-api/api-checkout.md | |
| @@ -39,7 +39,14 @@ | |
| 39 | - The `checkout.tags` property follows the framework-wide convention |
| 40 | that the first tag in the list is the primary branch and any others |
| 41 | are secondary. |
| 42 | - `errorCount` is +1 for each missing file. Conflicts are not treated as |
| 43 | errors because the CLI 'status' command does not treat them as such. |
| 44 | - TODO: Info for the parent version is currently missing. |
| 45 | - TODO: "merged with" info for the checkout is currently missing. |
| 46 |
| --- www/json-api/api-checkout.md | |
| +++ www/json-api/api-checkout.md | |
| @@ -39,7 +39,14 @@ | |
| 39 | - The `checkout.tags` property follows the framework-wide convention |
| 40 | that the first tag in the list is the primary branch and any others |
| 41 | are secondary. |
| 42 | - `errorCount` is +1 for each missing file. Conflicts are not treated as |
| 43 | errors because the CLI 'status' command does not treat them as such. |
| 44 | - The `"status"` entry for each of the `"files"` entries will be either a |
| 45 | single string containing a single description of the status change, or |
| 46 | an array of strings if more than one change was made, e.g. `"edited"` |
| 47 | and `"renamed"`. The status strings include:\ |
| 48 | `deleted`, `new`, `notAFile`, `missing`, `updatedByMerge`, |
| 49 | `updatedByIntegrate`, `addedBymerge`, `addedByIntegrate`, |
| 50 | `conflict`, `edited`, `renamed` |
| 51 | - TODO: Info for the parent version is currently missing. |
| 52 | - TODO: "merged with" info for the checkout is currently missing. |
| 53 |