Project

General

Profile

Bug #5561

PR diff doesn't update when target changes

Added by Evan Ward almost 2 years ago. Updated about 1 year ago.

Status:
Resolved
Priority:
Normal
Assignee:
-
Category:
-
Target version:
-
Start date:
13.08.2019
Due date:
% Done:

0%

Estimated time:
Sorting:
Commit Number:
Affected Version:

Description

Hi,

I have a git repository with a PR submitted to the master branch. A user then pushes commits to the git repository that updates the commit to which master points. Now the diff displayed in the PR is out of date and includes changes that are already accepted on master. I expect the diff to be the equivalent of git diff target...source even when the target pointer is updated.

For example, I see the issue with the following history:

* 8c5e00f - (4 hours ago) Commit 2 (B/bug)
| *   e74c974 - (6 hours ago) Merge pull request #5 (origin/master)
| |\  
| |/  
|/|   
* | 0bd6161 - (28 hours ago) Commit 1
|/  
*   c02d23d - (11 days ago) Commit 0  # origin/master was originally here

A PR was submitted from B/bug to origin/master when origin/master pointed to c02d23d and the displayed diff was correct. Then origin/master was updated to point to e74c974 and now the PR displays the wrong diff. Specifically the common ancestor was not updated so the PR diff shows 0bd6161 and 8c5e00f instead of just 8c5e00f like it should.

I'm using RhodeCode Enterprise 4.17.2.

Regards,
Evan

Also available in: Atom PDF