* Backport to branch `2.1.x` failed
Git reported the following error:
```
Auto-merging src/main/java/com/eprosima/fastdds/fastddsgen.java
Failed to merge submodule thirdparty/idl-parser (not checked out)
CONFLICT (submodule): Merge conflict in thirdparty/idl-parser
Recursive merging with submodules currently only supports trivial cases.
Please manually handle the merging of each conflicted submodule.
This can be accomplished with the following steps:
- come back to superproject and run:
git add thirdparty/idl-parser
to record the above merge or update
- resolve any other conflicts in the superproject
- commit the resulting index in the superproject
error: could not apply 88e9f39... Improve path processing (#330)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
```
* Backport to branch `2.5.x` failed
Git reported the following error:
```
Auto-merging src/main/java/com/eprosima/fastdds/fastddsgen.java
Failed to merge submodule thirdparty/idl-parser (not checked out)
CONFLICT (submodule): Merge conflict in thirdparty/idl-parser
Recursive merging with submodules currently only supports trivial cases.
Please manually handle the merging of each conflicted submodule.
This can be accomplished with the following steps:
- come back to superproject and run:
git add thirdparty/idl-parser
to record the above merge or update
- resolve any other conflicts in the superproject
- commit the resulting index in the superproject
error: could not apply 88e9f39... Improve path processing (#330)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
```
* Backport to branch `3.1.x` failed
Git reported the following error:
```
Auto-merging src/main/java/com/eprosima/fastdds/fastddsgen.java
Failed to merge submodule thirdparty/idl-parser (not checked out)
CONFLICT (submodule): Merge conflict in thirdparty/idl-parser
Recursive merging with submodules currently only supports trivial cases.
Please manually handle the merging of each conflicted submodule.
This can be accomplished with the following steps:
- come back to superproject and run:
git add thirdparty/idl-parser
to record the above merge or update
- resolve any other conflicts in the superproject
- commit the resulting index in the superproject
error: could not apply 88e9f39... Improve path processing (#330)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
```
* Backport to branch `3.2.x` failed
Git reported the following error:
```
Auto-merging src/main/java/com/eprosima/fastdds/fastddsgen.java
Failed to merge submodule thirdparty/idl-parser (not checked out)
CONFLICT (submodule): Merge conflict in thirdparty/idl-parser
Recursive merging with submodules currently only supports trivial cases.
Please manually handle the merging of each conflicted submodule.
This can be accomplished with the following steps:
- come back to superproject and run:
git add thirdparty/idl-parser
to record the above merge or update
- resolve any other conflicts in the superproject
- commit the resulting index in the superproject
error: could not apply 88e9f39... Improve path processing (#330)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
```
* Backport to branch `3.3.x` not needed, change already in branch `3.3.x`
* Backport to branch `4.0.x-devel` failed
Git reported the following error:
```
Auto-merging src/main/java/com/eprosima/fastdds/fastddsgen.java
Failed to merge submodule thirdparty/idl-parser (not checked out)
CONFLICT (submodule): Merge conflict in thirdparty/idl-parser
Recursive merging with submodules currently only supports trivial cases.
Please manually handle the merging of each conflicted submodule.
This can be accomplished with the following steps:
- come back to superproject and run:
git add thirdparty/idl-parser
to record the above merge or update
- resolve any other conflicts in the superproject
- commit the resulting index in the superproject
error: could not apply 88e9f39... Improve path processing (#330)
hint: After resolving the conflicts, mark them with
hint: "git add/rm ", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
```
This PR introduces improvements regarding path processing: in particular path normalization
Related idl parser PR: https://github.com/eProsima/IDL-Parser/pull/131 Fixes: #328