Contributors mailing list archives


Re: Migration to version 9

Tecnativa. S. L., Pedro M. Baeza
- 31/08/2015 13:23:49
I mean that you can't do the following sequence:

* You have branch 8.0.
* Clone 9.0 from 8.0.
* Make git rm over 9.0.
* Improve a module in 8.0.
* When trying to merge 8.0 changes in 9.0, it won't work, as changes are place on top of the other commits, and the git rm prevents to find where to apply changes. The only soluction will be a rebase, but that's not always possible when there are already modules migrated.


2015-08-31 12:53 GMT+02:00 Daniel Reis <>:
> I mentioned a major one: the diff shows you the entire addon as a new
> addition instead of showing you the +- lines of the migrated code.

@guewen You have a point. A workaround is to require porting work (if
any) to go in a second commit.
We should weight this disadvantage against the #2 disadvantage with the
extra work needed to check that changes in the previous major version
are forward ported.
IMO #3 is still safer.

> And another one is that you cannot merge branch 8.0 against 9.0 for
unported modules.

Sorry, I didn't understand. Doesn't my example do  that?
Or you mean porting modules in the 8.0 "__unported__" sirectory?
Those are to be ported from 7.0 instead of 8.0: `git checkout 7.0 --


Post to: