[Bug] Cherry picking a file rename together with file changes loses the file changes

[Khoeckman]

I am cherry picking a commit with the following changes (balance.ts is renamed from tokens.ts and has some changes)

Fixing conflicts during the cherry-pick:

Empty changes for balance.ts

When fixing all conflicts and clicking "Commit 4 files", balance.ts indeed does not include the changes.
This issue also happens when reverting a commit.

[DanPristupov]

Are those changes already in the active branch may be? That's why the diff is empty.

[Khoeckman]

Well for the cherry-pick case, yes actually so scratch that. But I needed to revert a commit and that didn't work.

This is the result of my revert, changes not included, only the rename.

As you can see for the revert commit (File Tree panel) the file name is back to tokens.ts, but the function names and parameters are still balance_* instead of tokens_*.

This is the commit im reverting:

[DanPristupov]

Well for the cherry-pick case, yes actually so scratch that. But I needed to revert a commit and that didn't work.

Revert = negated cherry-pick. If cherry-pick only applied a rename, revert will apply the negated rename.

This is the result of my revert, changes not included, only the rename.

Which means, the only change was the file rename. The content was not modified.

P.S. Fork simply runs git cherry-pick <SHA> or git revert <SHA>. The implementation is on the git side. It might seem illogical to you, but most likely it's correct.