summaryrefslogtreecommitdiff
path: root/README.md
diff options
context:
space:
mode:
Diffstat (limited to 'README.md')
-rw-r--r--README.md20
1 files changed, 15 insertions, 5 deletions
diff --git a/README.md b/README.md
index 13d0d03af6c..049ee563648 100644
--- a/README.md
+++ b/README.md
@@ -3,14 +3,11 @@ About Odoo
Odoo is suite of OpenSource Business apps. More info at http://www.odoo.com
-Odoo setup instructions (employees)
-===================================
-
-https://github.com/odoo/odoo/blob/master/doc/git.rst
-
Installation
============
+[Setup/migration guide for employees](https://github.com/odoo/odoo/blob/master/doc/git.rst)
+
System Requirements
-------------------
@@ -59,3 +56,16 @@ Setting up your database
Point your browser to http://localhost:8069/ and click "Manage Databases", the
default master password is "admin".
+
+Migration from bazaar
+=====================
+
+If you have existing bazaar branches and want to move them to a git repository,
+there are several options:
+
+* download http://nightly.openerp.com/move-branch.zip and run it with
+ `python move-branch.zip -h` (for the help). It should be able to convert
+ simple-enough branches for you (even if they have merge commits &al)
+* Extract the branch contents as patches and use `git apply` or `git am` to
+ rebuild a branch from them
+* Replay the branch by hand