Diff view in Pull requests shows incorrect and misleading information Edited

Bitbucket server version 5.5.3

The diff view when comparing two branched in depot sometimes gives false information that I can`t understand.

 

Here I list the two branches in question, the version number in each file, and the diff comparisons with the diff client in git bash.

 

Finally, I`ve added two images from the diff view in bitbucket that show a different value. The "to" value in the bitbucket diff view is correct, but the "from" value is incorrent which is misleading.

It looks as though the behaviour between git-diff and diff view in bitbucket is inconsistent.

 

 

 

branch 1: master

branch 2: feature/add-boostrap-3.3.7

Content of the file package.json at head of each branch.

$ git checkout feature/add-boostrap-3.3.7
Switched to branch 'feature/add-boostrap-3.3.7'
Your branch is up to date with 'origin/feature/add-boostrap-3.3.7'.

$ more package.json
{
"name": "tiweb.static.libs",
"version": "1.2.0",

$ git checkout master
Switched to branch 'master'
Your branch is up to date with 'origin/master'.

$ more package.json
{
"name": "tiweb.static.libs",
"version": "1.1.2",

Preview of the diff in each direction

$ git diff feature/add-boostrap-3.3.7..master package.json
diff --git a/package.json b/package.json
index b5d51c5..b1dca15 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "tiweb.static.libs",
- "version": "1.2.0",
+ "version": "1.1.2",

 

$ git diff master..feature/add-boostrap-3.3.7 package.json
diff --git a/package.json b/package.json
index b1dca15..b5d51c5 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "tiweb.static.libs",
- "version": "1.1.2",
+ "version": "1.2.0",

So far, this all seems correct.

Image for the same diff in bitbucket

The images show values that don`t exist in either branch (but they are most likely previous values in the files in question.)  The nature of that value changes often so it`s hard to reproduce. but it seems to be something along the lines of two files changing the same value away from the common ancestor value. and then chanching back to a new value, that both files share. i.e. both branches change to the same value independently.

it`s important to  note that this error does not always happen. but when it does, it`s very confusing.

 

feat-master.jpgmaster-feat.jpg

2 answers

Hi Patrick, we'll need further information to continue troubleshooting this issue so I've created a Support ticket for you. You'll receive an email notification shortly, please follow the instructions there.

Once you get it solved it would be great if you could come back to this post and share the solution with the rest of the Community, so it can help other users :)

Let us know if you have any questions!

Best regards,

Ana

Issue was resolved, thanks for the explanation Atlassians.

for info: a blog post with a nice explanation.

https://developer.atlassian.com/blog/2015/01/a-better-pull-request/

TL;DR

before you create a pull request, the diff view shows the diff from head of  source branch to the common ancestor ("...") when the PR is actually created, the diff view is head of source branch against head of target branch.

Suggest an answer

Log in or Join to answer
Community showcase
Piotr Plewa
Published Dec 27, 2017 in Bitbucket

Recipe: Deploying AWS Lambda functions with Bitbucket Pipelines

Bitbucket Pipelines helps me manage and automate a number of serverless deployments to AWS Lambda and this is how I do it. I'm building Node.js Lambda functions using node-lambda&nbsp...

673 views 0 4
Read article

Atlassian User Groups

Connect with like-minded Atlassian users at free events near you!

Find a group

Connect with like-minded Atlassian users at free events near you!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot