Forums

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

Pull request diff shows file with no changes

RodgerLeblanc
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 15, 2020

We recently upgraded to Bitbucket Server 7.0.1 and are now experiencing issues.

Sometimes, a pull request diff will contain files that are actually modified but the changes doesn't appear in the file viewer.

 

MicrosoftTeams-image.png

In  this screenshot, the line 10331 contains the actual change, but the line is not visible. 

Also, note that there should be a bottom line showing "..." (like the line on top of line 10321) that you can click to inspect the code further down, but it is not present.

 

We've seen other issues in pull request like diff showing changes that are actually already in the target branch, unfortunately I don't know what causes some pull request to flag code as changes where this code is already present in the target branch.

 

I have read the blog post A better pull request, particularly the "Logical conflicts that merge cleanly" part, but it doesn't seem to be related to the issue we're experiencing.

 

Any help is appreciated.

1 answer

0 votes
Aaron
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
April 16, 2020

Hello Rodger,

 

What you are seeing is the bug https://jira.atlassian.com/browse/BSERV-12309. You would just add something like the following to your bitbucket.properties file and restart Bitbucket to work around the issue.

page.max.diff.lines=15000

 

Keep in mind that doing this can cause some additional load as Bitbucket is now attempting to load more lines of the diff. But this should work around the issue while we work to resolve it. :)

 

Regards,
Aaron Levinson
Dev Tools Support Engineer

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events