Forums

Articles
Create
cancel
Showing results for 
Search instead for 
Did you mean: 

Is there a branch comparison bug in bitbucket server version 4.14 (self hosted with my organisatio)?

pjg
I'm New Here
I'm New Here
Those new to the Atlassian Community have posted less than three times. Give them a warm welcome!
April 12, 2018

I can recreate a bug in this version, where the compare view doesn't properly display diffs between branches.

In the case where you have two branches with a common ancestor, but different subsequent commits, the diff screen will only show you the commits from the common ancestor onwards. 

e.g. I have 

master = c1,c2
branch1 = c1,c2,y1,y2
branch2 = c1,c2,z1,z2.


On comparing branch1 and branch2, for the diff i would expect to see the removal of y1 and y2 changes, and the addition of z1 and z2 changes.

The git diff command 'git diff branch1 branch2' produces the output I expect. 




1 answer

1 accepted

0 votes
Answer accepted
Caterina Curti
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
April 12, 2018

Hi @pjg,

You are spot on here.

Bitbucket Server performs the branch starting at the common ancestor. You can follow the conversation on this topic on this feature request:

- BSERV-7375

 

More details on how a Diff in Bitbucket Server is generated are also provided on the Understanding Diff view in Bitbucket Server page.

 

Cheers,

Caterina - Atlassian

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events