+:orphan: true
+
=============
Bazaar to git
=============
Use the easy-setup shell script::
- curl https://raw.github.com/odoo/odoo/master/checkout.sh | sh
+ curl -O https://raw.githubusercontent.com/odoo/odoo/master/odoo.py | python2
it will will ask a few questions and create a local copy.
-.. note:: if the repository is private, you have to download it manually then
- execute it wherever you want your working copy to be created, go to
- https://github.com/odoo/odoo/blob/master/checkout.sh then click the
- **Raw** button.
-
Git concepts
------------
the official repository and main branches, roughly corresponds to the old
"mainline" branches in bazaar. You should never need to push to it, and by
default your local copy is configured to forbid it.
-``dev``
+``odoo-dev``
a grab-bag of development branches, you can push your work to it so other
coworkers can work with you.
* update your remotes with ``git fetch --all``
* create your development branch with ``git checkout -b <branch_name>
<source_branch>``. For instance if you wanted to add support for full-text
- search in trunk you could use ``git checkout -b trunk-fts-xxx odoo/trunk``
+ search in master you could use ``git checkout -b master-fts-xxx odoo/master``
* do your changes, stage them with ``git add`` and commit them with ``git
commit``
* if your branch is long-lived, you may want to update it to its parent
- update the remotes with ``git fetch --all``
- merge the remote branch into the local one with ``git merge --no-ff
- odoo/trunk``
+ odoo/master``
* to push the branch to the development repository, use ``git push -u dev
<branchname>``, this will automatically create a branch called
Tasks
-----
+Converting your feature branches from bazaar
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+`The readme`_ has some instructions.
+
Viewing history: ``git log``
~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.. [#log-patch-empty] but only the changes performed by this actual commit,
for a merge the merged changes are not considered part
of the merge commit
+
+.. _the readme: https://github.com/odoo/odoo/blob/master/README.md#migration-from-bazaar