Skip to content

Commit

Permalink
Add some bazaar migration notes
Browse files Browse the repository at this point in the history
  • Loading branch information
xmo-odoo committed May 16, 2014
1 parent 699bae4 commit 7a2bb30
Showing 1 changed file with 15 additions and 5 deletions.
20 changes: 15 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
-------------------

Expand Down Expand Up @@ -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

0 comments on commit 7a2bb30

Please sign in to comment.