Skip to content

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Jan 14, 2026

Description

Add XML/YAML launch file equivalents for intermediate Tf2 tutorials.

  • Add XML and YAML equivalents for all Python launch files
  • Update tutorial documentation with tabbed multi-format code examples

Fixes #6006

Did you use Generative AI?

Partially - Cursor AI Assistant for generating XML/YAML launch file equivalents and tutorial rephrasing. Each generated line reviewed.

Additional Information

Signed-off-by: Luke Sy <[email protected]>
(cherry picked from commit 81786ba)

# Conflicts:
#	source/Tutorials/Intermediate/Tf2/Adding-A-Frame-Cpp.rst
#	source/Tutorials/Intermediate/Tf2/Adding-A-Frame-Py.rst
#	source/Tutorials/Intermediate/Tf2/Debugging-Tf2-Problems.rst
#	source/Tutorials/Intermediate/Tf2/Learning-About-Tf2-And-Time-Cpp.rst
#	source/Tutorials/Intermediate/Tf2/Time-Travel-With-Tf2-Cpp.rst
#	source/Tutorials/Intermediate/Tf2/Using-Stamped-Datatypes-With-Tf2-Ros-MessageFilter.rst
#	source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Broadcaster-Cpp.rst
#	source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Broadcaster-Py.rst
#	source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Listener-Cpp.rst
#	source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Listener-Py.rst
@mergify
Copy link
Contributor Author

mergify bot commented Jan 14, 2026

Cherry-pick of 81786ba has failed:

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

You are currently cherry-picking commit 81786ba.
  (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:
	new file:   source/Tutorials/Intermediate/Tf2/launch/listener_cpp_launch.xml
	new file:   source/Tutorials/Intermediate/Tf2/launch/listener_cpp_launch.yaml
	new file:   source/Tutorials/Intermediate/Tf2/launch/listener_py_launch.xml
	new file:   source/Tutorials/Intermediate/Tf2/launch/listener_py_launch.yaml
	new file:   source/Tutorials/Intermediate/Tf2/launch/py_turtle_tf2_demo_launch.xml
	new file:   source/Tutorials/Intermediate/Tf2/launch/py_turtle_tf2_demo_launch.yaml
	new file:   source/Tutorials/Intermediate/Tf2/launch/py_turtle_tf2_dynamic_frame_demo_launch.xml
	new file:   source/Tutorials/Intermediate/Tf2/launch/py_turtle_tf2_dynamic_frame_demo_launch.yaml
	new file:   source/Tutorials/Intermediate/Tf2/launch/py_turtle_tf2_fixed_frame_demo_launch.xml
	new file:   source/Tutorials/Intermediate/Tf2/launch/py_turtle_tf2_fixed_frame_demo_launch.yaml
	new file:   source/Tutorials/Intermediate/Tf2/launch/start_tf2_debug_demo_launch.xml
	new file:   source/Tutorials/Intermediate/Tf2/launch/start_tf2_debug_demo_launch.yaml
	new file:   source/Tutorials/Intermediate/Tf2/launch/turtle_tf2_demo_launch.xml
	new file:   source/Tutorials/Intermediate/Tf2/launch/turtle_tf2_demo_launch.yaml
	new file:   source/Tutorials/Intermediate/Tf2/launch/turtle_tf2_dynamic_frame_demo_launch.xml
	new file:   source/Tutorials/Intermediate/Tf2/launch/turtle_tf2_dynamic_frame_demo_launch.yaml
	new file:   source/Tutorials/Intermediate/Tf2/launch/turtle_tf2_fixed_frame_demo_launch.xml
	new file:   source/Tutorials/Intermediate/Tf2/launch/turtle_tf2_fixed_frame_demo_launch.yaml
	new file:   source/Tutorials/Intermediate/Tf2/launch/turtle_tf2_sensor_message_launch.xml
	new file:   source/Tutorials/Intermediate/Tf2/launch/turtle_tf2_sensor_message_launch.yaml

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   source/Tutorials/Intermediate/Tf2/Adding-A-Frame-Cpp.rst
	both modified:   source/Tutorials/Intermediate/Tf2/Adding-A-Frame-Py.rst
	both modified:   source/Tutorials/Intermediate/Tf2/Debugging-Tf2-Problems.rst
	both modified:   source/Tutorials/Intermediate/Tf2/Learning-About-Tf2-And-Time-Cpp.rst
	both modified:   source/Tutorials/Intermediate/Tf2/Time-Travel-With-Tf2-Cpp.rst
	both modified:   source/Tutorials/Intermediate/Tf2/Using-Stamped-Datatypes-With-Tf2-Ros-MessageFilter.rst
	both modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Broadcaster-Cpp.rst
	both modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Broadcaster-Py.rst
	both modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Listener-Cpp.rst
	both modified:   source/Tutorials/Intermediate/Tf2/Writing-A-Tf2-Listener-Py.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

@mergify mergify bot added the conflicts label Jan 14, 2026
Signed-off-by: Alejandro Hernandez Cordero <[email protected]>
@github-actions
Copy link

HTML artifacts: https://github.com/ros2/ros2_documentation/actions/runs/20995750709/artifacts/5126687598.

To view the resulting site:

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

@ahcorde ahcorde merged commit cb056d2 into humble Jan 14, 2026
5 checks passed
@ahcorde ahcorde deleted the mergify/bp/humble/pr-6031 branch January 14, 2026 14:24
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.

3 participants