Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[13740] Add afunction that checks for repeated -I paths (issue #78) (backport #429) #430

Open
wants to merge 2 commits into
base: 3.3.x
Choose a base branch
from

Conversation

mergify[bot]
Copy link

@mergify mergify bot commented Jan 10, 2025

Description

Added a function that checks if the paths included with the -I function have already been added, and skips them if so. This solves issue #78, and was suggested by the original author. I had to update a couple of terms to the new notation, so we should be careful with backports.

@Mergifyio backport 3.3.x 2.5.x 2.1.x

Fixes #78

Contributor Checklist

  • Commit messages follow the project guidelines.

  • Tests that thoroughly check the new feature have been added/Regression tests checking the bug and its fix have been added; the added tests pass locally

  • N/A New feature has been documented/Current behavior is correctly described in the documentation.

  • Applicable backports have been included in the description.

Reviewer Checklist

  • The PR has a milestone assigned.
  • The title and description correctly express the PR's purpose.
  • Check contributor checklist is correct.
  • Check CI results: changes do not issue any warning.
  • Check CI results: failing tests are unrelated with the changes.

This is an automatic backport of pull request #429 done by [Mergify](https://mergify.com).

@mergify mergify bot added the conflicts label Jan 10, 2025
Copy link
Author

mergify bot commented Jan 10, 2025

Cherry-pick of 5f95b79 has failed:

On branch mergify/bp/3.3.x/pr-429
Your branch is up to date with 'origin/3.3.x'.

You are currently cherry-picking commit 5f95b79.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   src/main/java/com/eprosima/fastdds/fastddsgen.java

no changes added to commit (use "git add" and/or "git commit -a")

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally

Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com>
@juanjo4936 juanjo4936 force-pushed the mergify/bp/3.3.x/pr-429 branch from 29a0c72 to 9765ae8 Compare January 13, 2025 08:23
@juanjo4936 juanjo4936 added ci-pending PR which CI is running and removed conflicts labels Jan 13, 2025
@juanjo4936 juanjo4936 requested review from MiguelCompany and removed request for juanjo4936 January 13, 2025 08:24
Signed-off-by: Juanjo Garcia <juanjosegarcia@eprosima.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ci-pending PR which CI is running
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants