NextERP/runbot
5
0
Fork 0
mirror of https://github.com/odoo/runbot.git synced 2025-03-15 23:45:44 +07:00
Code Issues Actions Packages Projects Releases Wiki Activity
374 Commits 242 Branches 2 Tags 48 MiB
Python 82.9%
JavaScript 16.4%
CSS 0.4%
SCSS 0.3%
a40b4c20da
Go to file
Xavier Morel a40b4c20da [ADD] runbot_merge: flag to disable rebase before merge 
rebase-and-merge (or squash-merge if pr.commits == 1) remains default,
but there are use cases like forward ports (merge branch X into branch
X+1 so that fixes to X are available in X+1) where we really really
don't want to rebase the source.

This commits implements two alternative merge methods:

If the PR and its target are ~disjoint, perform a straight merge (same
as old default mode).

However if the head of the PR has two parents *and* one of these
parents is a commit of the target, assume this is a merge commit to
fix a conflict (common during forward ports as X+1 will have changed
independently from and incompatibly with X in some ways).

In that case, merge by copying the PR's head atop the
target (basically rebase just that commit, only updating the link to
the parent which is part of target so that it points to the head of
target instead of whatever it was previously).
2018-09-03 13:16:36 +02:00
runbot [IMP] runbot: skip an additional port for chrome 2018-08-14 13:57:31 +02:00
runbot_cla [FIX] runbot_cla: fix enforce utf-8 even when runbot locale is different 2018-03-14 11:07:55 +01:00
runbot_merge [ADD] runbot_merge: flag to disable rebase before merge 2018-09-03 13:16:36 +02:00
.gitignore [IMP] runbot smaller status bar 2015-01-18 19:21:32 +01:00
README.md [REF] README: update the readme file for the brand new repo 2018-03-08 16:59:39 +01:00

README.md

Odoo Runbot Repository

This repository contains the source code of Odoo testing bot runbot.odoo.com and related addons.

Runbot

The runbot/ directory holds the main runbot Odoo addon.

Runbot CLA addon

The runbot_cla/ directory contains an Odoo addon that checks CLA.