[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
Re: [gemoc-dev] potential pb on github/gemoc/gemoc-studio-eclipsefork
|
Hi Didier,
Did you document in a single place all the jobs, such as we do not have to retrieve all the emails announcing this if needed in the future?
Many thanks,
Benoit
--
Benoit Combemale
http://combemale.fr
> Le 5 nov. 2018 à 12:15, Didier Vojtisek <didier.vojtisek@xxxxxxxx> a écrit :
>
> Hi
>
> I've set up a jenkins job to automatically sync the master of gemoc forked repositories and official eclipse repositories
>
> It runs every hours
> https://ci.inria.fr/gemoc/job/sync_forked_repositories
>
> FYI, source of the synchronization script :
> https://github.com/gemoc/gemoc-studio-jenkins/blob/master/scripts/sync_git_masters.sh
>
>
> best regards
> Didier
>> Le 05/11/2018 à 15:54, Didier Vojtisek a écrit :
>> Hi
>>
>> I've reset the gemoc/gemoc-studio-eclipsefork master branch, it is now correctly synched with eclipse/gemoc-studio master branch ( resetting back to the last common commit and then by following https://help.github.com/articles/syncing-a-fork/ as I have done in the past; the approach using github interface doesn't work)
>>
>> I hope everything will be ok for all of us
>>
>> I've saved the wrong branch as "master-old" just in case
>>
>> Didier
>>
>>> Le 19/10/2018 à 11:11, Didier Vojtisek a écrit :
>>>
>>> Hi
>>>
>>> I may have done a mistake when I tried to synchronize eclipse/gemoc-studio (master) with gemoc/gemoc-studio-eclipsefork (master) (cf. one of my preious message)
>>>
>>>
>>> apparently it created 2 commits (66c6c27 and 3315c24) whereas I was expecting to simply replicate eclipse/gemoc-studio history in the fork
>>>
>>> this is strange because, actually there is no differences (in term of files differences)
>>>
>>> This may lead to difficulties when trying to do more synchronization and crafting pull request
>>>
>>> however, as this is online I don't known how to cleanly fix the history... (I may do --force on gemoc/gemoc-studio-eclipsefork but it may break people git repo ? or I may create a dummy pull request on eclipse/gemoc-studio but this will create "ugly" commit on the official repo...)
>>>
>>> If anyone has a suggestion ...
>>>
>>> we definively also need a clean procedure to synchronize these repo
>>>
>>> Didier
>>>
>>
>
> --
> Didier Vojtisek
> SED Rennes - DiverSE Team
> Inria, Univ Rennes, CNRS, IRISA
> Campus de beaulieu
> 35042 Rennes
> 02 99 84 75 07
>
> _______________________________________________
> gemoc-dev mailing list
> gemoc-dev@xxxxxxxxxxx
> To change your delivery options, retrieve your password, or unsubscribe from this list, visit
> https://www.eclipse.org/mailman/listinfo/gemoc-dev