Re: [Freemint-discuss] Bintray integration / git force-push needed

[David G. <dga...@gm...>]

2018-03-13 22:36 GMT+01:00 Miro Kropáček <mir...@gm...>:
> Hi David,
>
> On 14 March 2018 at 06:13, David Gálvez <dga...@gm...> wrote:
>>
>> I've observed something weird after the repository's clean up:
>>
>> Look the history of the file sys/mint/arch/delay.h
>>
>> https://github.com/freemint/freemint/commits/master/sys/mint/arch/delay.h
>>
>> the commit from Jun 26 2014 "Merge from Trunk"
>>
>> This commit seems from some Alan's branch not the trunk
>
>
> This is OK -- one of the changes I've made is to make Alan's "usbtos" branch
> a real git branch. That means that you can follow the initial fork, its
> separate commits and then merge back to master. In CVS/former git repository
> it was really messed up and while it has very little meaning I did it as a
> nice git exercise (yes, I regretted it later ;)).
>
> Content-wise it should be the same, i.e. there shouldn't be any differences
> against the commit after the old CVS "merge" point.
>

OK. Perhaps not very important but some differentiate commits now are
together with others in one big commit.

For example this PCI-BIOS differentiate commit:
https://github.com/DavidGZ/freemint/commit/9d0a0b5701f3421bc9cc61eb352c6cedbfaf9d50#diff-ae395915bb2dac4ca2ce7c3217a8d1ab

Now is mixed with some other commits with no relation:
https://github.com/freemint/freemint/commit/72818b654b732896deaa31d9a686a3951b96f71a#diff-ae395915bb2dac4ca2ce7c3217a8d1ab