openerp-expert-framework team mailing list archive

[Raphael Valyi <rvalyi@xxxxxxxxx>]

The bzr-replay bug missing files when replaying merges could be that one:
https://bugs.launchpad.net/bzr-rewrite/+bug/632894

It's set to high priority since 2011 and nobody worked on it since then...

To be frank I'm a bit fed up of that bzr broken tooling...

I already got unofficial rumors from inside Canonical that Canonical guys
themselves admit in private they lost the battle against git (at least).
I'm not sure we are doing us a favor ignoring what they don't have the
courage to admit publicly...

Anyway, this is for the long run, as for now let's try to get the job done
moving out from the extra-addons hell.


Regards.


-- 
Raphaël Valyi
Founder and consultant
http://twitter.com/rvalyi <http://twitter.com/#!/rvalyi>
+55 21 2516 2954
www.akretion.com



On Fri, Nov 2, 2012 at 2:19 PM, Raphael Valyi <rvalyi@xxxxxxxxx> wrote:

> Hello,
>
>
> Well unfortunately for the extra-addons extraction I proposed,
> the bzr-fastimport process explained here fails much more badly:
>
>    - Out of 8 modules to extract, only 2 were extracted
>    - only 16 commits out of ~42
>
> See https://gist.github.com/4001686 for details
>
> So I'm continuing with the Ruby/replay script, the last version is now:
> https://gist.github.com/4001400
>
> An example on how to use it for the financial addons extraction is:
> https://gist.github.com/4001449
>
> So far there are a few bugs left, but really it works much better than
> bzr-fastimport:
>
>    - it misses no addons
>    - it misses no commit
>    - now what happens is that is fails to include some files when
>    replaying some merges. At this stage I'm 100% sure that this is because
>    bzr-replay itself is broken.
>
> I'm investing not even using bzr-replay to doing it all using bzr revert
> -r, cutting unwanted modules out and committing, step by step.
>
> What a boring thing guys! But I want to finish that today. I don't want to
> hear about extra-addons anymore!
>
> NB: given our observations, it's highly probably that the Antony
> extraction failure reported by Stefan could be due to these bzr-fastimport
> bugs. As for these broken addons filtered out, may be the copyright history
> is less important to keep they tend to be 100% OpenERP modules (community
> contribs usually focus on fixing fixable modules instead). It means that
> for these extra-addons, the big  patch of the remaining diff could be some
> acceptable work-around.
>
> Now I'll try to get it done clean for the extra-addons as it's very
> important to be respectful to all these years of community hardwork and
> copyrights.
>
>
> Best regards.
>
>
> --
> Raphaël Valyi
> Founder and consultant
> http://twitter.com/rvalyi <http://twitter.com/#!/rvalyi>
> +55 21 2516 2954
> www.akretion.com
>
>
>
>
> On Fri, Nov 2, 2012 at 2:04 PM, Joël Grand-Guillaume <
> joel.grandguillaume@xxxxxxxxxxxxxx> wrote:
>
>> Dear community,
>>
>>
>> Some feed-back summary after investigation:
>>
>>
>> Le 2 nov. 2012 à 09:26, Joël Grand-Guillaume <
>> joel.grandguillaume@xxxxxxxxxxxxxx> a écrit :
>>
>> ...
>> 2) Take a branch you want to extract one folder from, here I took : bzr
>> branch lp:c2c-addons/6.1 c2c-addons-61
>>
>> 3) Export all history into the stream : bzr fast-export c2c-addons-61 >
>> test.fi
>>
>> 4) Filter the folder you wanna extract from, here analytic_hours_block,
>> into another stream : bzr fast-import-filter -i analytic_hours_block
>> test.fi > subfolder.fi
>>
>> 5) Make a new folder and init it with bazaar: mkdir my_new_branch; cd
>> my_new_branch; bzr init .
>>
>> 6) Import all the history from the filtered stream : bzr fast-import ../
>> subfolder.fi
>>
>> Note there are quite lots of options with bzr fast-import-filter, you can
>> exclude folder instead of including one, as well as including more than one
>> folder like:
>>
>> bzr fast-import-filter -i analytic_department/ -i analytic_hours_block/
>> test.fi > subfolder.fi
>>
>>
>>
>> At this stage, it could still remains some missing commit (I try to
>> figure out why, but did not succeed yet..). To ensure you don't miss
>> something, at the end, make a diff between the folder you've extracted and
>> commit the remaining differences in one single last commit. Based on what
>> I've saw, > 80-90 % of the commit are taken perfectly and we miss the
>> rest... Seems better than having zero history.
>>
>> Regards,
>>
>> Joël
>>
>>
>>      --
>>
>>
>> *Joël Grand-Guillaume** *
>> *Division Manager*
>> *Business Solutions*
>> *
>> *
>> *Camptocamp SA*
>> PSE A, CH-1015 Lausanne
>>
>> http://openerp.camptocamp.com/
>>
>>
>> Phone: +41 21 619 10 28
>> Office: +41 21 619 10 10
>> Fax: +41 21 619 10 00
>> Email: joel.grandguillaume@xxxxxxxxxxxxxx
>>
>>
>> _______________________________________________
>> 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
>>
>>
>