search

pal-robotics / aruco_ros

Software package and ROS wrappers of the Aruco Augmented Reality marker detector library
MIT License
448 stars 306 forks source link

Kinetic devel update from indigo #42

Closed v-lopez closed 6 years ago

v-lopez commented 6 years ago

Catching up with the fixes in indigo-devel.

We can either accept this PR, or we can rebase kinetic-devel on top of indigo-devel.

bmagyar commented 6 years ago

Other than that, all good. About rebasing or merging this over: It's up to you how clean you wish to keep the history. This amount of stuff is probably messy both ways.

v-lopez commented 6 years ago

I'll probably rebase this last time.

Then I'll create a release for 1.0.0 for kinetic-devel, and from that point future changes from indigo-devel shall be ported via cherry-pick without breaking the history.

v-lopez commented 6 years ago

@bmagyar I'm closing this and rebasing kinetic-devel on top of indigo-devel.

jdlangs commented 6 years ago

@v-lopez I don't think kinetic-devel should ever be rebased because that will invalidate everyone's local clone.

bmagyar commented 6 years ago

The majority of the code-base should be changed to use OpenCV3 which is available with Kinetic. That will render any local changes invalid invalid anyways.

Also, if you've got changes to be contributed, feel free to bring them forward!

jdlangs commented 6 years ago

Sorry, I wasn't clear. Breaking changes on the branch are fine (and welcome). But rebasing it rewrites it's history so our local copies effectively become separate branches and we would have to all delete or rebase our stuff to sync it with this remote.