Integrated: 1080: /backport command reports conflict even though there isn't any

Erik Joelsson erikj at
Tue Jun 15 13:41:45 UTC 2021

On Tue, 15 Jun 2021 00:31:03 GMT, Erik Joelsson <erikj at> wrote:

> This patch fixes a bug with the /backport commit command. It currently materializes the workspace where the cherry-picking is done from the wrong repository. It should be using the target repository, but instead it's using the "fork" (which is the repo from which we create the pull request if /backport is successful). 
> In the tests, this wasn't handled at all. All the tests used the same hosted repository for the "fork" as the target. I introduced a separate "fork" repository in the tests where it would make a difference. 
> I changed the backportDoesNotApply test so that it would fail without this fix. I also think I made it clearer why the backport shouldn't apply as well.
> Finally I added a new test which verifies a situation very similar to the original issue reported.

This pull request has now been integrated.

Changeset: 5cf9d46c
Author:    Erik Joelsson <erikj at>
Stats:     88 lines in 2 files changed: 81 ins; 0 del; 7 mod

1080: /backport command reports conflict even though there isn't any

Reviewed-by: kcr



More information about the skara-dev mailing list