Deleting Cherry Pick links

[kumori_kuma]

Is there a way to do this? I’m running into the scenario this user is from 2012 and I see no way to resolve it: suggestion: add a cherry pick without link option / or allow delete of cherry pick links - Branching and merging - Plastic SCM Community

I want to delete that branch in the middle there, but I can’t because it has a changeset that I cherry picked to a different branch, because I checked in some changes to the wrong branch. Now it’s just… stuck there? How can I delete it?

[carlosalba1985]

I’m afraid that you cannot delete branches in Plastic. You can use the subtractive merge operation to deintegrate a specific changeset/branch.

Why we don't delete branches in Plastic?

[kumori_kuma]

That’s not entirely correct right? You can delete a branch if you delete all the changesets in it. This isn’t about deleting the branch after merging, this is about the branch was created by mistake or is never integrated into a main branch.

Anyway the question was not about deleting branches, it’s about deleting cherry pick links. If you take a look at the original forum post from 2012, it’s talking the exact scenario. I’m wondering if that was ever implemented in the past 12 years.

[carlosalba1985]

@kumori_kuma

That’s not entirely correct right? You can delete a branch if you delete all the changesets in it. This isn’t about deleting the branch after merging, this is about the branch was created by mistake or is never integrated into a main branch.

In this specific case, this changeset was integrated into another branch so you cannot delete it. The same happens when a branch is merged into another branch.
As you mentioned, you can delete branches only after deleting all the changesets of this branch and in your example, the changeset cannot be deleted because it was integrated in some other branch.

@kumori_kuma

Anyway the question was not about deleting branches, it’s about deleting cherry pick links. If you take a look at the original forum post from 2012, it’s talking the exact scenario. I’m wondering if that was ever implemented in the past 12 years.

This is a Plastic Core behavior and it hasn’t been changed. You cannot delete a changeset if it was merged/cherry-picked/integrated into some other branch.

We are currently on a new feature that allows us to soft-delete/hide branches in a repository. I think it may be useful for you.

[kumori_kuma]

If I made some changes and checked in on Branch A incorrectly, and I want to move them to Branch B, how would I do that? Branch A only has that one changeset so I’m okay with deleting the changeset and the branch. I just need to get the changes over to Branch B. Is there a way to turn a changeset into a shelf? Clearly cherry picking was the incorrect option :c

[carlosalba1985]

Please check the last comment here to avoid the duplicated conversations:

Turn changeset into a shelf

Let’s say I check in some changes, and I accidentally included a folder I didn’t mean to. What I would want to do is turn the changeset into a shelf. Delete the changeset. Apply the shelf. Undo the files I didn’t mean to checkin. Redo the checkin. Is there a way to get a shelf from a changeset? This scenario seems like it’d be pretty common to run into. In Git, I would just do an uncommit. An “uncheckin” command would be welcome, but promoting to shelf would work too. It’s been suggested in th…