Skip to content

Commit 998d85f

Browse files
authored
Merge pull request #10505 from orenc17/imporve_importer
Improve importer.py
2 parents 22d78b4 + d1fa7bd commit 998d85f

File tree

2 files changed

+224
-164
lines changed

2 files changed

+224
-164
lines changed

tools/importer/README.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ Note: Only files present in folder will be copied, directories inside the folder
1616
`commit_sha` is list of commits present in mbed-os repo. These commits will be applied after copying files and folders listed above.Each commit in the commit_sha list is cherry-picked and applied with the -x option, which records the SHA of the source commit in the commit message.
1717
Note: You must resolve any conflicts that arise during this cherry-pick process. Make sure that the "(cherry picked from commit ...)" statement is present in the commit message. Re-execute the python script to apply rest of the SHA commits.
1818

19+
```json
1920
{
2021
"files" : [
2122
{
@@ -41,9 +42,10 @@ Note: You must resolve any conflicts that arise during this cherry-pick process.
4142
],
4243
"commit_sha" : [
4344
"428acae1b2ac15c3ad523e8d40755a9301220822",
44-
"d9d622afe0ca8c7ab9d24c17f9fe59b54dcc61c9",
45+
{"sha": "d9d622afe0ca8c7ab9d24c17f9fe59b54dcc61c9", "msg": "Fix ..."}
4546
]
4647
}
48+
```
4749

4850
### Input to importer.py
4951
1. Repository: -r <repo_path> ( Example: CMSIS / Mbed-tls)
@@ -52,4 +54,3 @@ Note: You must resolve any conflicts that arise during this cherry-pick process.
5254
For example the command below can be used to update CMSIS:
5355
`python tools\importer\importer.py -c tools\importer\cmsis_importer.json -r <path to cmsis repo>`
5456

55-
Note: This script must be run from the mbed-os directory to work correctly.

0 commit comments

Comments
 (0)