Compare functionality not working properly between branches

Hi Team,

I am trying to compare two different branches (a release branch to develop branch) in Atlassian Stash (version - 3.11.1). In the 'Diff' - I am able to see that the comparison is happening between the latest commit of the release branch and penultimate commit of the develop branch. Any idea why this is happening.

Warm Regards,

-Jewel

1 answer

Hi Jewel,

I'm not sure, but I suspect one of two things:

1. Someone force pushed the develop branch back by a commit. So the actual latest commit is now the penultimate one.

2. The last commit happened after you loaded the develop branch on the compare page. The commit gets cached in the browser until you refresh the page.

Hope that helps,

Adam

Hi Adam,

 

Thank you for the input. I have done a detailed check. But these two does not seem to be the case. In the first option, I have checked in the commit history, and the last commit is correct only.

Also, could you please confirm if I am doing the right steps.

Went to Stash --> <repository> --> Compare --> Select Source and Destination (chosen Develop and release respectively) and clicked on Diff.

This should compare the latest commit between these branches, right?

 

Regards,

-Jewel

Yeah that sounds right. How do you know that it's checking against the penultimate commit? What is that conclusion based on?

Is there some specific content in that last commit that you are expecting to see, but don't? Does the information for latest commit in the form show a different hash than you'd  expect?

Is it also possible that your browser is caching one of the network requests? Can you reproduce this in multiple browsers?

If you look at the network requests that occur when you go through those steps you mentioned. It would be interesting to see what comes back. There are a few requests that might be returning the wrong value.

 

It may be worth opening a support ticket so we can debug further using your server logs too. As it is. I'm a bit stumped, sorry.

"Is there some specific content in that last commit that you are expecting to see, but don't?" - Yes,. This is correct only,.. We have made some changes in the latest commit and it is not showing in the Diff screen. In fact, the Diff screen is showing the content that is saved in the penultimate commit.

May be we can try the different browser a go. But the issue here is, multiple users are facing the same problem.

Sounds like a back end issue then. Pretty odd! I'd definitely recommend opening a support ticket. It's possible something will come out of the logs. Alternatively we might be able to run some git commands to make sure the repo isn't somehow corrupted. A part of me is still expecting this is some kind of misunderstanding too, so it might help to share screenshots of what you are seeing, and git cli output of what you are expecting to see, just to make absolutely sure we have the same understanding of the problem.

 

Best of luck!

Adam

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...

705 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