openerp-expert-framework team mailing list archive
-
openerp-expert-framework team
-
Mailing list archive
-
Message #00569
Re: Script for replaying massively your commit from a branch to an other
I'm not too sure rebasing helps,
the main issue is that there are commits that impact several modules (like
an automatic Launchpad l10n commit, but there are many others) and that
assume those modules are in a certain shape to work. When you want to take
some extra-addons module and put it somewhere else, like back in its own
branch you won't have those other modules or they won't be in the same shape
and this is where the rebasing doesn't work. At least on bzr, I used to work
with bzr replay which is part of the bzr rebase plugin and it failed exactly
there. So I could be mistaken, but I'm pretty sure Sebastien's script helps
a to port modules from one branch to an other.
Finally, we use bzr because OpenERP uses bzr for all, that would be a
pleasure to use git, but honestly that isn't deeply integrated with the
OpenERP ecosystem today.
BTW, does apps.openerp.com supports git branchs?
On Wed, Aug 24, 2011 at 2:22 PM, Leonardo Santagada
<santagada@xxxxxxxxxxxx>wrote:
> 2011/8/24 P. Christeas <xrg@xxxxxxxx>:
> > On Wednesday 24 August 2011, sebastien beau wrote:
> >> Hi all
> >> Just a quick talk about a script that I have just done (or started ;) ).
> >> It's just a prototype, but it's work and can help you (if you want to
> >> improve it, you're welcome).
> >> Indeed today I try to replay all commit from some module
> >> (base_sale_multichannels, base_external_referentials,
> sale_bundle_product,
> >> sale_exceptions, base_scheduler_creator, product_variant_multi,
> >> product_variant_multi_advanced...) of the extra-addons to extra-trunk.
> >
> > You could simply use 'git rebase', too..
> > No need to waste your life on bzr, I've done that for you.
> >
>
> bzr probably has some form of rebase too.
>
> there is bzr-rebase and https://launchpad.net/bzr-rewrite . probably
> the rewrite plugin can do something like the filters in mercurial so
> you can slice a big repository in smaller ones.
>
> _______________________________________________
> Mailing list: https://launchpad.net/~openerp-expert-framework
> Post to : openerp-expert-framework@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~openerp-expert-framework
> More help : https://help.launchpad.net/ListHelp
>
Follow ups
References