search

moveit / moveit_resources

URDFs, meshes, and config packages for MoveIt testing
65 stars 118 forks source link

Declare conflict with old Pilz package #153

Closed rhaschke closed 2 years ago

rhaschke commented 2 years ago

Fixes #152.

gavanderhoorn commented 2 years ago

I first thought breaks would be better (although not sure we can actually do that with just a change to package.xml), but I believe the following applies here (from here):

Conflicts should be used:

  • when two packages provide the same file and will continue to do so,

which I believe is the case.

Replace then also seems like it is what should be used here.

Perhaps @jspricke could confirm?

rhaschke commented 2 years ago

I applied the second version of Replace, which requires both, Replace and Conflicts. Only these are supported by package.xml. Breaks isn't.

gavanderhoorn commented 2 years ago

I think I agree. I was just thinking @jspricke has quite a lot of experience here, so asking him for confirmation seems like a good idea.

Only these are supported by package.xml. Breaks isn't.

if it would be better (ie: using Breaks), we could add it using a patch to the release repository or a Bloom patch.

rhaschke commented 2 years ago

I think Replace does the job here. Let's @jspricke confirm...

jspricke commented 2 years ago

I'm lacking a bit of context here. Was the conflicting file moved from one package to the other? related read: https://wiki.debian.org/RenamingPackages

rhaschke commented 2 years ago

The package was actually migrated from prbt_ikfast_manipulator_plugin to moveit_resources_prbt_ikfast_manipulator_plugin, but the old package still exists. Removing the old package and apply the suggested migration approach would be a next step to take.

jspricke commented 2 years ago

tl/dr: this seems fine to me.

Thanks. So we have exactly the situation detailed in the RenamingPackages page. Some notes: