← Back to team overview

openerp-community team mailing list archive

Re: Avoid duplicate PRs, port stable branches to master (Re: 8.0 branch for l10n-italy)


Yeah, that's ideally true, but if branches start to differ, maybe you
cannot make a PR against another branch. For example, on spanish
localization, if you make a change on 7.0, you cannot make a PR of this
branch against 8.0 branch, because now there are some slight differences,
and probably they are going to be bigger in the future: icons path,
migration scripts... So the only solution is to make a PR of the same
branch against all remote branches that applies.


2014-07-18 10:06 GMT+02:00 Lionel Sausin <ls@xxxxxxxxxxxxxxxx>:

> Le 17/07/2014 20:21, Pedro Manuel Baeza Romero a écrit :
>> Well, my personal opinion about this question is that having an early 9.0
>> (or master) will provoke that people making PRs to 8.0 branch, don't make
>> the same PR to the new branch, getting inconsistencies between the two
>> branches, and having more updated the 8.0 one, or double the work to do.
> For some time now the stable branches have been merged regularly into
> later stable branches and master and the new PR policy is to target the
> oldest stable release applicable. So we officially must not make duplicate
> PRs on official branches. ie: if a fix is applicable to v5.0, v6.0, v6.1,
> v7, v8 and master, you make only 1 PR targeting v5.0, not 6 PRs.
> Shouldn't the same be done for OCA repositories?
> I suppose git makes it easier than bzr used to.
> _______________________________________________
> Mailing list: https://launchpad.net/~openerp-community
> Post to     : openerp-community@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~openerp-community
> More help   : https://help.launchpad.net/ListHelp

Follow ups