summaryrefslogtreecommitdiff
path: root/setup/setup_dev.py
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-03-01 16:49:15 +0100
committerChristophe Simonis <chs@odoo.com>2017-03-01 16:49:15 +0100
commit68176d80ad6053f52ed1c7bcf294ab3664986c46 (patch)
treec7bee8d477f8f4fc2f58e91fecb969c5d05af024 /setup/setup_dev.py
parent3c8a2bcaf0710e9e12c82194c36180fb207d97ee (diff)
parenteddefc9948b1a56bfc72e4c54fee09f8954331fd (diff)
[MERGE] forward port branch saas-14 up to eddefc9948b
Diffstat (limited to 'setup/setup_dev.py')
-rwxr-xr-xsetup/setup_dev.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/setup/setup_dev.py b/setup/setup_dev.py
index 5ddac8b1a6f..0038ad3fd8a 100755
--- a/setup/setup_dev.py
+++ b/setup/setup_dev.py
@@ -87,10 +87,10 @@ def cmd_setup_git():
run('git','config','remote.odoo-dev.url','https://github.com/odoo-dev/odoo.git')
run('git','config','remote.odoo-dev.pushurl','git@github.com:odoo-dev/odoo.git')
run('git','remote','update')
- # setup 9.0 branch
- run('git','config','branch.9.0.remote','odoo')
- run('git','config','branch.9.0.merge','refs/heads/9.0')
- run('git','checkout','9.0')
+ # setup 10.0 branch
+ run('git','config','branch.10.0.remote','odoo')
+ run('git','config','branch.10.0.merge','refs/heads/10.0')
+ run('git','checkout','10.0')
else:
printf('no git repo found')