marge-bot icon indicating copy to clipboard operation
marge-bot copied to clipboard

fix: resolve issue with batching MRs and forked MRs (#302)

Open sg70 opened this issue 3 years ago • 1 comments

Since all forked MRs are prepared to local branches, the MR acceptance procedure needs to be also local.

  • fix batching MRs when source branch has different repo url
  • add debug messages
  • update unit tests
  • add unit test for use case forked MRs
  • remove credentials from debug log

Changes:

/tmpiq7raaob/tmpb84bjxf0 # git merge origin/dummy21 --ff --ff-only
merge: origin/dummy21 - not something we can merge

Into:

/tmpiq7raaob/tmpb84bjxf0 # git merge dummy21 --ff --ff-only
Updating b51f541..9525b89
Fast-forward
 21 | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 21

Signed-off-by: Sascha Binckly [email protected]

sg70 avatar Oct 01 '21 10:10 sg70

@qqshfox we have used this custom version for a couple of month without any issue. It would be nice to have this merged into the project.

@bigc2000 we created the issue and worked on a solution as well. We have our fix running internally since May. Let's team up on one PR.

sg70 avatar Oct 01 '21 10:10 sg70