Pull request file changes should compare with latest head of target branch (OD-123)
Michael Weimann opened 6 years ago

What I did:

  • Creates a PR with a change from feature branch into master
  • Updated the master branch
  • Merged master into the feature branch
  • Went to file changes in the PR
  • It now displays the changes from the "master merge" as changes in the PR

Expected: "Master merge" changes are not displayed as changes

  • Michael Weimann changed title 6 years ago
    Previous Value Current Value
    PR: File changes doesn't update source branch
    PR: File changes do not update if source branch has new commits
  • Michael Weimann commented 6 years ago

    Reproducing PR: https://onedev.io/projects/michael.test/pulls/1/changes

    • test branch created
    • PR test -> master opened
    • README in master edited
    • merged master into test
  • Robin Shen commented 6 years ago

    Pull request changes is currently calculated by comparing source branch against target branch at the time of creating pull request. I agree that it should be more natural to compare against latest of target branch.

    Need to investigate it further as some other features such as code comments and review statuses are built upon this assumption.

  • Michael Weimann commented 6 years ago

    Uff - this is a quite weird behaviour.
    In my test project merges are common.

    The only way reviewing changes is by looking at the "merge preview".
    But there it is not possible to comment :/

  • Robin Shen batch edited 6 years ago
    Name Previous Value Current Value
    Iterations
    empty
    3.1.2
  • Robin Shen changed title 6 years ago
    Previous Value Current Value
    PR: File changes do not update if source branch has new commits
    Pull request file changes should compare with latest head of target branch
  • Robin Shen changed fields 6 years ago
    Name Previous Value Current Value
    Type
    Bug
    Improvement
  • OneDev changed state to 'Closed' 6 years ago
    Previous Value Current Value
    Open
    Closed
  • Michael Weimann commented 6 years ago

    👍

  • xg427 changed state to 'Open' 6 years ago
    Previous Value Current Value
    Closed
    Open
  • Robin Shen commented 6 years ago

    The state "Closed" in code.onedev.io now means the issue is closed but not released yet. Have you observed incorrect behavior of this fix on master branch?

  • Robin Shen changed state to 'Closed' 6 years ago
    Previous Value Current Value
    Open
    Closed
  • Robin Shen commented 6 years ago

    Change state to "Closed" as work on this issue is done.

  • OneDev changed state to 'Released' 6 years ago
    Previous Value Current Value
    Closed
    Released
  • OneDev referenced from other issue 6 years ago
issue 1/1
Type
Improvement
Priority
Normal
Assignee
Iterations
Issue Votes (0)
Watchers (3)
Reference
OD-123
Please wait...
Connection lost or session expired, reload to recover
Page is in error, reload to recover