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

[19089] Fix HelloWorld DataSharing example idl (backport #3714) #3886

Closed
wants to merge 1 commit into from

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Sep 28, 2023

This is an automatic backport of pull request #3714 done by Mergify.
Cherry-pick of 4fed0bd has failed:

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

You are currently cherry-picking commit 4fed0bd5d.
  (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)

Changes to be committed:
	modified:   examples/C++/DDS/ContentFilteredTopicExample/HelloWorld.idl
	modified:   examples/C++/DDS/ContentFilteredTopicExample/HelloWorldPubSubTypes.h
	modified:   examples/C++/DDS/HelloWorldExample/HelloWorld.cxx

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	both modified:   examples/C++/DDS/ContentFilteredTopicExample/HelloWorld.h
	deleted by us:   examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldCdrAux.hpp

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


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

* Refs #19089: Fix HelloWorld DataSharing example idl as bounded

Signed-off-by: JesusPoderoso <[email protected]>

* Refs #19089: Revert uncrustify fix in types

Signed-off-by: JesusPoderoso <[email protected]>

---------

Signed-off-by: JesusPoderoso <[email protected]>
(cherry picked from commit 4fed0bd)

# Conflicts:
#	examples/C++/DDS/ContentFilteredTopicExample/HelloWorld.h
#	examples/cpp/dds/HelloWorldExampleDataSharing/HelloWorldCdrAux.hpp
@mergify mergify bot added the conflicts Backport PR wich git cherry pick failed label Sep 28, 2023
@JesusPoderoso
Copy link
Contributor

I am closing this PR due to HelloWorkExampleDataSharing does not exist in this Fast DDS 2.6.x version.

@mergify mergify bot deleted the mergify/bp/2.6.x/pr-3714 branch September 28, 2023 06:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
conflicts Backport PR wich git cherry pick failed
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant