Uploaded image for project: 'Bitbucket Server'
  1. Bitbucket Server
  2. BSERV-7522

Configurable Pull Request Diff Mode (two dot vs three dot diff mode)

    XMLWordPrintable

    Details

    • Type: Suggestion
    • Status: Closed (View Workflow)
    • Resolution: Duplicate
    • Fix Version/s: None
    • Component/s: None
    • Labels:
      None
    • Feedback Policy:
      We collect Bitbucket feedback from various sources, and we evaluate what we've collected when planning our product roadmap. To understand how this piece of feedback will be reviewed, see our Implementation of New Features Policy.

      Description

      We are running stash 3.6 I reviewed the release notes from 3.10 down aswell as jira and didn't find anything related.

      The pull request diff view seen before the pull request is created looks like the three dot version of C git diff.

      i.e. git diff $(git merge-base A B) B

      It is showing the changes along the B branch since the merge point which give an indication of what will be merged into A.

      For our project that uses cherry picks we are really much more interested in the two dot version:

      i.e. git diff A B

      In our scenario we have a develop branch where development occurs. At some point we create a release branch from it and then cherry pick a few changes that can go to the production release.

      So at this point all of the changes in release are in develop its just that they have been cherry-picked instead of merged.

      Post release we want to merge the release branch down into develop.

      When we create the pull request the diff in the preview is showing the diff of all of the cherry picked commits.

      When the pull request is created the diff changes to show what we want which is a diff of the head of the develop branch and the head of the release branch (in our case no changes).

      We'd like to have an option in the repository settings to change the preview mode from three dot to two dot.

      Another way would be to have a way to set the preference on a branch by branch basis.

      i.e. if you are making a pull request from the release branch then use two dot diff instead of the three dot diff.

        Attachments

          Issue Links

            Activity

              People

              Assignee:
              Unassigned Unassigned
              Reporter:
              michael.ocleirigh Michael O'Cleirigh
              Votes:
              0 Vote for this issue
              Watchers:
              2 Start watching this issue

                Dates

                Created:
                Updated:
                Resolved: