-
Enable Rerere
git config --global rerere.enabled 1
-
If one branch failes with a note about
merge.renamelimit
, try it again with the recommended value.- Set with
git config merge.renameLimit <NUMBER>
- Unset afterwards with
it config --unset merge.renameLimit
- Set with
-
Lookout for something like:
Recorded preimage for 'odoo/addons/base/res/res_partner_view.xml'
in case of a conflict. It indicates that rerere is working.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Error: | |
Odoo Server Error | |
Traceback (most recent call last): | |
File "/opt/odoo/odoo/fields.py", line 937, in __get__ | |
value = record.env.cache.get(record, self) | |
File "/opt/odoo/odoo/api.py", line 960, in get | |
value = self._data[field][record.id][key] | |
KeyError: <odoo.api.Environment object at 0x7f6ec90a2940> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
folders=("vendor/odoo/cc/.git" "vendor/odoo/ee/.git") | |
branches=("master" "11.0") | |
owndev="dev" | |
prefix="remotes/" | |
RED='\033[0;31m' | |
GREEN='\033[0;32m' | |
NC='\033[0m' # No Color |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
folders=("vendor/odoo/cc/.git" "vendor/odoo/ee/.git") | |
branches=("master" "11.0") | |
owndev="dev" | |
for folder in "${folders[@]}"; do | |
echo -e "\n\nFetching ${folder}\n" | |
gitcmd="git --git-dir ${folder}" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
folders=("vendor/odoo/cc/.git") | |
devbranch="master" | |
branches=("11.0") | |
owndev="dev" | |
prefix="remotes/" | |
canidate_branches="remotes/${owndev}/${devbranch}-" | |
RED='\033[0;31m' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
#!/bin/bash | |
folders=("vendor/odoo/cc/.git" "vendor/odoo/ee/.git") | |
devbranch="master" | |
branches=("11.0") | |
owndev="dev" | |
prefix="remotes/" | |
RED='\033[0;31m' | |
GREEN='\033[0;32m' |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
# -*- coding: utf-8 -*- | |
# Part of Odoo. See LICENSE file for full copyright and licensing details. | |
import datetime | |
import imp | |
import json | |
import logging | |
import os | |
import re | |
import sys |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
apiVersion: "odoo.k8s.io/v1alpha1" | |
kind: "OdooCluster" | |
metadata: | |
name: "mausi" | |
namespace: "odoo" | |
spec: | |
tracks: | |
- name: "v10" | |
image: | |
registry: "docker.io" |
- A running k8s cluster (eg. with Rancher 2.0)
- A recent go version installed
.kube/config
configured to access the cluster- An external postgres database service
- Operator-SDK installed, start here: https://github.com/operator-framework/operator-sdk#quick-start
gotchas incorporated
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
"""Load data efficiently into Odoo""" | |
import threading | |
import xmlrpclib | |
import hashlib | |
import sys | |
import json | |
import datetime | |
import pandas as pd, numpy as np | |
from time import time, sleep |