git cherry pick command confuses bitbucket

sanjaytest

Here is a scenario that looks like a defect in bitbucket.

 

Have 2 branches in bitbucket repo

1. develop   2. release

 

One commit that was present in develop branch, i used the git cherry pick command to push to release branch.  Once that is done, the same commit is now present in release and develop both.

Even after this, if i raise a pull request from develop to release the same commit still shows up in the differences. 

I think this is a defect on bitbucket side, and should be fixed. Happy to hear what others think about this.

Theodora Boudale

Hi @sanjaytest and welcome to the community.

A few months ago we changed our diff algorithm from what we call a '3-way' diff to a 2-way 'three-dot' diff:

• https://bitbucket.org/blog/improving-performance-on-complex-diffs

The previous diff algorithm included changes in the destination branch. The new diff algorithm does not reflect changes made to the destination branch since the source branch was created from the destination branch. This change allowed us to improve performance on complex diffs.

If you want to see changes made to the destination branch, you can simply merge the destination branch into the source branch. The blog post I shared has instructions on how to do so in the section "How to see changes to the destination branch in a pull request".

We have a request in our issue tracker for offering the option to preview the previous type of diff on demand:

• https://jira.atlassian.com/browse/BCLOUD-21964

You can add your vote and comment there to further express your interest.

Kind regards,
Theodora