Skip to content

Add notification about the usage of <rclcpp/rclcpp.hpp>. (backport #7113) - #7144

Merged
ahcorde merged 2 commits into
kiltedfrom
mergify/bp/kilted/pr-7113
Aug 31, 2026
Merged

Add notification about the usage of <rclcpp/rclcpp.hpp>. (backport #7113)#7144
ahcorde merged 2 commits into
kiltedfrom
mergify/bp/kilted/pr-7113

Conversation

@mergify

@mergify mergify Bot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor

Description

closes #7095

Fixes # (issue)

Did you use Generative AI?

Yes, Claude Fable 5

Additional Information


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

Signed-off-by: Tomoya Fujita <fujita.tomoya@triorb.co.jp>
Signed-off-by: Katherine Scott <katherineAScott@gmail.com>
Co-authored-by: Katherine Scott <katherineAScott@gmail.com>
(cherry picked from commit e8142b2)

# Conflicts:
#	source/ROS-Framework/client-libraries/Working-with-Client-Libraries/Single-Package-Define-And-Use-Interface.rst
@mergify mergify Bot added the conflicts label Aug 31, 2026
@mergify

mergify Bot commented Aug 31, 2026

Copy link
Copy Markdown
Contributor Author

Cherry-pick of e8142b2 has failed:

On branch mergify/bp/kilted/pr-7113
Your branch is up to date with 'origin/kilted'.

You are currently cherry-picking commit e8142b2.
  (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:   conf.py
	modified:   source/Tutorials/Advanced/FastDDS-Configuration.rst
	modified:   source/Tutorials/Advanced/Reading-From-A-Bag-File-CPP.rst
	modified:   source/Tutorials/Advanced/Recording-A-Bag-From-Your-Own-Node-CPP.rst
	modified:   source/Tutorials/Advanced/Simulators/Webots/Code/MyRobotDriver.cpp
	modified:   source/Tutorials/Advanced/Simulators/Webots/Code/MyRobotDriver.hpp
	modified:   source/Tutorials/Advanced/Simulators/Webots/Setting-Up-Simulation-Webots-Advanced.rst
	modified:   source/Tutorials/Advanced/Topic-Statistics-Tutorial/Topic-Statistics-Tutorial.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Custom-ROS2-Interfaces.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Using-Parameters-In-A-Class-CPP.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Cpp-Publisher-And-Subscriber.rst
	modified:   source/Tutorials/Beginner-Client-Libraries/Writing-A-Simple-Cpp-Service-And-Client.rst
	modified:   source/Tutorials/Demos/Content-Filtering-Subscription.rst
	modified:   source/Tutorials/Intermediate/Monitoring-For-Parameter-Changes-CPP.rst
	modified:   source/Tutorials/Intermediate/RViz/Marker-Points-and-Lines/Marker-Points-and-Lines.rst
	modified:   source/Tutorials/Intermediate/RViz/Marker-Sending-Basic-Shapes/Marker-Sending-Basic-Shapes.rst
	modified:   source/Tutorials/Intermediate/Tf2/Adding-A-Frame-Cpp.rst
	modified:   source/Tutorials/Intermediate/Tf2/Using-Stamped-Datatypes-With-Tf2-Ros-MessageFilter.rst
	modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Broadcaster-Cpp.rst
	modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Listener-Cpp.rst
	modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Static-Broadcaster-Cpp.rst
	modified:   source/Tutorials/Intermediate/URDF/Using-URDF-with-Robot-State-Publisher-cpp.rst
	modified:   source/Tutorials/Intermediate/Using-Node-Interfaces-Template-Class.rst
	modified:   source/Tutorials/Intermediate/Writing-an-Action-Server-Client/Cpp.rst
	new file:   source/_internal/Rclcpp-Convenience-Header-Note.rst

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   source/ROS-Framework/client-libraries/Working-with-Client-Libraries/Single-Package-Define-And-Use-Interface.rst

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

The mergify backport of #7113 assumed rolling's directory layout, where
the client-library tutorials were moved under
ROS-Framework/client-libraries/Working-with-Client-Libraries/. On kilted
those files still live at their older, shallower locations, so the
backport was broken in two ways:

- It re-added Single-Package-Define-And-Use-Interface.rst under the
  rolling-only path. That file already exists at How-To-Guides/ on this
  branch, so the copy was an orphan (not in any toctree) with dangling
  cross-references and failed the build. Removed it.

- Every ".. include::" of the convenience-header note used a relative
  path computed for rolling's deeper tree, so it overshot the source
  root on kilted and the note file could not be found (failing both the
  Sphinx build and doc8). Recomputed each include to the correct
  relative depth for its own location.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
Signed-off-by: Tomoya.Fujita <fujita.tomoya@triorb.co.jp>
@fujitatomoya
fujitatomoya requested a review from ahcorde August 31, 2026 12:30
@fujitatomoya fujitatomoya self-assigned this Aug 31, 2026
@fujitatomoya

Copy link
Copy Markdown
Collaborator

@ahcorde requesting your approval since i resolved some conflicts.

@github-actions

Copy link
Copy Markdown

HTML artifacts: https://github.com/ros2/ros2_documentation/actions/runs/33392008896/artifacts/9757980496.

To view the resulting site:

  1. Click on the above link to download the artifacts archive
  2. Extract it
  3. Open html-artifacts-7144/index.html in your favorite browser

@ahcorde
ahcorde merged commit 935b50f into kilted Aug 31, 2026
6 checks passed
@ahcorde
ahcorde deleted the mergify/bp/kilted/pr-7113 branch August 31, 2026 12:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants