Migrate from Launchpad.

nhomar commented 10 years ago

First job.

Migrate fron launchpad and configure all the repository withsome odoo community standars.

nhomar commented 10 years ago

The first import was done, just waiting to be tested.

sebalix commented 10 years ago

I have read a bit about Git flow, and found that the "multiple stable releases" support is done by the "git flow support" workflow: http://yakiloo.com/getting-started-git-flow/

With that, we can fix older releases. But AFAIK, this is not expected that these fixes can be merged in newer releases. In short, my workflow in Bazaar to support several releases was:

work on trunk (new features) ;
when it is time to release, create a new branch (for instance 0.7), switch to it, and add the tag 0.7.0 ;
work on trunk (new features) ;
release as previous (0.8)
one day, someone encountered a bug. I try to reproduce it on all releases I want to support (mainly the 2 last releases branches, so 0.7 and 0.8 here), I swith to the old one (0.7), fix, run tests, and tag (0.7.1) ;
I switch to the 0.8, merge the 0.7 branch in it, adapt the fix if needed, tests, and make a tag (0.8.1),
I switch on the trunk/master, and merge the 0.8 branch in it, adapt the fix if needed, and run tests
...continue to add new features on trunk

The policy was to start the fix on the older supported release and merge back in upper ones, one by one, until I reach the trunk/master. By default the git flow was thought in the "one release supported at a time", this is why they create the 'git flow support' feature later (experimental). As I understand it, we can't do a "merge" between branches like I was used to, instead we should adopt a "cherry picking" policy to backport fixes in other releases.

Sooo, if you have to import all stable branches from Launchpad, can you create them with the pattern 'support-X.Y' (git flow convention I think)? I think they should point on the last tag available for the branch (support-0.7 will point on the same changeset of the tag 0.7.3, and so on). Is it possible?

Thanks for your help anyway :)

sebalix commented 10 years ago

Hum, forget it, we will create support branches manually if needed. We can start as it is now, it will be simpler.

sebalix commented 10 years ago

Some updates about GitHub migration: https://github.com/osiell/oerplib/pull/2

sebalix commented 10 years ago

Nhomar, do you need to merge your hotfix/configure branch into master to test Travis?

osiell / oerplib

Migrate from Launchpad. #1