Skip to content
New issue

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

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

Already on GitHub? # to your account

typelib: Merge toolchain-2.7 and master branches for the 2.8 release #23

Open
meyerj opened this issue Nov 3, 2014 · 2 comments
Open

Comments

@meyerj
Copy link
Member

meyerj commented Nov 3, 2014

The master and rock1408 branches of typelib diverged from toolchain-2.7 significantly (or vice-versa):

Which commits from which branch should be included in a new toolchain-2.8 branch for the upcoming release?

Related questions:

@doudou
Copy link
Contributor

doudou commented Nov 4, 2014

There are mainly two type of changes there:

  • the ROS-specific stuff, which should now go on its own branch
  • the OSX fixes which seem to already be on master. Typelib does not depend on utilmm anymore, and dyncall's has been ripped out, so quite a few OSX-related fixes are not needed anymore.

@meyerj
Copy link
Member Author

meyerj commented Dec 1, 2014

I recently merged the master branch into toolchain-2.8 in 251439b in order to have the latest updates of package.xml. Can master be considered as stable or should this be reverted, so that toolchain-2.8 is based on rock1408 instead? I remember that there was a discussion about this, but I could not find it anymore.

The only differences between master and toolchain-2.8 are the updated version number in package.xml, the catkin env-hook for environment setup (which requires additional dependencies) and one additional header file to be installed (master...toolchain-2.8#files_bucket). Please review the changes and merge or cherry-pick to master whatever is reasonable.

Any objections against releasing the current toolchain-2.8 branch in ROS indigo?

# for free to join this conversation on GitHub. Already have an account? # to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants