Uploaded image for project: 'Bitbucket Cloud'
  1. Bitbucket Cloud
  2. BCLOUD-15661

Pull request diff incorrect due to obsolete commits (mercurial)

    XMLWordPrintable

Details

    Description

      We have the (experimental) evolve extension enabled for mercurial and generally are quite happy with Bitbucket's support for that mercurial extension. However, today I recognized an issue in context of pull requests.

      A PR has been merged accidentally. We pruned the merge commit to undo the change. The first problem was, that the PR was still marked as "merged", although the merge commit is obsolete now. To work around this, we created a new PR. This new PR had, as intended, all commits on the topic branch included. The problem is, though, that when looking at the PR now, only commits done since the previous accidental merge are listed.

      It looks like the PR diff is done using the commits on the topic branch and commits on any head on the default branch. This is wrong. Only the tip (most recent non-obsolete) head on default branch should be used to render the diff between topic branch and default.

      Attachments

        Activity

          People

            Unassigned Unassigned
            1c40c4c88338 Christian Bünnig
            Votes:
            0 Vote for this issue
            Watchers:
            1 Start watching this issue

            Dates

              Created:
              Updated:
              Resolved: