behind/ahead incorrect

Ming Han Yeoh

This question is in reference to Atlassian Documentation: Using branches in Bitbucket Server

What I wanted to do:

  delete merged branches by using 'master' branch as comparison using the Behind/Ahead function.

Problem:

  I found many of the branch contain just 1 or 2 commit Ahead of the master branch. So i try to see the diff with 'create pull request' function. I confirmed that Bitbucket show me there are diff between the two branch. I proceed by clicking the 'create' button.

  then the system show me that there are no changes on the diff tab.

Question:

  Is that Bitbucket having some problem when comparing branches and show me the wrong 'Behind/Ahead' status??

bitbucket behind ahead branch incorrect.png

bitbucket behind ahead branch incorrect.png

Jeff Thomas

Hi,

When creating a pull request Bitbucket Server displays the diff to the common ancestor of the two branches selected. On the command line this looks like git diff -M -C target-branch...source-branch – path/to/file.txt. What this diff shows you is the accumulation of the changes in the source branch since it branched from the target branch. When you actually create the pull request the diff displayed is the diff which would be applied to the target branch as a result of merging the source branch into it. Locally this would be what you would see if you checked out the target branch and performed git merge source-branch --no-commit. Most of the time, this diff will be exactly the same, but in some circumstances the diffs can be slightly different.

This is what appears to be happening from the screenshot you provided. The preview for the pull request shows that there are changes to be applied (likely the 1 commit that's ahead), but when we're actually displaying the pull request diff, there are no changes to be applied from the source branch to the target branch. Is is possible that changes were cherry picked from the source to destination branch? 

Also, if you manually run the git diff and git merge commands from above, do you get the same results as what Bitbucket Server is displaying?