Pull request allow specification of destination branch, which is ignored (BB-2125)

M6 KVM avatarM6 KVM created an issue

In order to reproduce this issue, create a repository, create default and develop branches, and then folk the repository. Once forked, work on a new feature branch in the clone, and then send a pull request from the new branch, specifying develop as the destination branch.

Although you ask asked for a commit message, inspection of the parent repository will reveal that the merge happened on the default branch, regardless of the fact you have specified that develop is the destination branch.

If you are using named branches, this means that it is not possible to use this feature.

Comments (2)

  1. Brodie Rao

    I've just put out a fix for this.

    Our in-memory merge algorithm was doing everything correctly except for one thing: it neglected to mark the merge commit as being on the correct destination branch -- it was defaulting to the default branch. It should now properly take the branch of the destination (the first parent in the merge).

    Sorry for the inconvenience, and thanks for the report!

  2. Log in to comment
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.