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

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

Hi Miro,

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 the file's history in the trunk:
(only the latest commits)

commit 834cde6e3a92edce1793facd47b84ab2cbe17592
Author: David Gálvez <dga...@gm...>
Date:   Fri Feb 16 19:04:41 2018 +0100

    Delete CVS's keyword $Id$ from a bunch of files

    This keyword is unused since the migration to Git.

commit 9eedecd51c2dcbe2b69ccda512ade3737689c59f
Author: David Gálvez <dga...@gm...>
Date:   Mon Feb 12 19:38:50 2018 +0100

    Remove unused declaration of function udelay()

    This declaration seems to have been slipped in through
    Linux-m68k and from Linux-arm where the delays functions
    aren't inlined but in a library.

commit 249e0c32b3afc4f572b4378095c514cc0cc6207c
Author: David Gálvez <dga...@gm...>
Date:   Mon Feb 12 18:06:23 2018 +0100

    Use loops calculation formula for 68000 builds

    Builds for the 68000 were using a very simple delay mechanism,
    just looping as many times as the microseconds requested. Now
    we use the formula that was added for the ColdFire, which lacks
    of the mulul instruction too.

commit fa63267501d06df20f219921dc7cf3796ce73560
Author: Alan Hourihane <al...@fa...>
Date:   Wed Jul 16 16:31:33 2014 +0000

    Merge usbtos branch to the trunk.

    This brings in lots of updates, fixes and new features.

    - USB stack now available for TOS only (requires the usb ACCessory)
    - New USB mouse driver
    - SCSIDRV available for TOS only (possibly for FreeMiNT later)
    - Unicorn USB adapter driver available for TOS only. Others need porting.

    Thanks to Roger Burrows for his work on bringing some of the USB code
    out of assembly language and into C too !

commit a6b6e1abb753bb5f3f2b1bb0e31f9c3db84f4438
Author: Alan Hourihane <al...@fa...>
Date:   Sun Apr 27 14:45:25 2014 +0000

    Update the udelay timer. Brought from the m68k-nommu tree.
    Contributed by David Galvez

commit dd3d8d8f3136e616a8ff39b5bbddab2cb7dc35c0
Author: Alan Hourihane <al...@fa...>
Date:   Sat May 7 04:19:57 2011 +0000

    Re-enable USB support and rename to XHDI_MASS_STORAGE_SUPPORT


2018-03-13 2:18 GMT+01:00 Miro Kropáček <mir...@gm...>:
> Following the rule "no answer = go ahead" :) I've done it -- so all branches
> and tags are rebased, history cleaned etc. I still need to do a few things
> (bintray seems to hate me today) so most likely another commit will follow
> but that should be it.
>
> The easiest way to cope with the change (if you don't have any local commit
> in your github fork's master) just pull from the upstream repo, reset your
> master to the new head and force push to your github remote master.
>
> After that you can either rebase or cherry pick your local branches. I find
> cherry-pick the easiest way as there's virtually no code change in the
> changed history at all, just removed files, so there shouldn't be any
> conflicts.
>
> If you bump into some strange troubles, just post it here, I'll try to help.
>
> On 8 March 2018 at 10:51, Miro Kropáček <mir...@gm...> wrote:
>>
>> Hi guys,
>>
>> just resending this email as had been sent just in the middle of the
>> SourceForge crisis so it's possible it didn't reach everyone. I have last
>> few days of my time available to do this so it would be nice if we reach
>> some agreement here, especially from Alan. IMO it's worth the small
>> annoyance (as we gain a smaller repository, non-polluted history, ...).
>>
>> On 24 February 2018 at 09:45, Miro Kropáček <mir...@gm...>
>> wrote:
>>>
>>> Hi guys,
>>>
>>> I had a few free afternoons so I finally looked into
>>> https://github.com/freemint/freemint/issues/79. Encouraged by Vincent's and
>>> Thorsten's deployment experiments I've decided to try something new and
>>> exciting too. :)
>>>
>>> You can see the result here: https://github.com/mikrosk/freemint, namely:
>>>
>>> (supposedly) faster boot times; I didn't have to use 'sudo' (thanks to
>>> Vincent's launchpad repository + the apt plugin) therefore Travis uses a
>>> Docker image instead of a full VM
>>> 99% travis-clean git history; only one commit is present (adding
>>> .travis.yml)
>>> 99% guarantee that the history will stay travis-clean in the future; if
>>> you look into .travis.yml you'll see it's basically just a stub, everything
>>> is downloaded and applied automatically
>>> no more dilemmas with improving build scripts -- in fact, you can deploy
>>> new stuff on the same source base again and again, just using Travis
>>> "restart build" functionality (so the new build script would be downloaded
>>> but the version etc would be kept)
>>> no more abusing of https://github.com/freemint/travis-pr and
>>> https://github.com/freemint/freemint.github.io for build outputs, everything
>>> goes to bintray: https://bintray.com/freemint/freemint
>>> fancy download icons ;), nice download statistics, ...
>>>
>>> The final burst of motivation was adding Bintray support to Travis, so
>>> instead of this dark magic (hats off, Thorsten!) I could do just this.
>>>
>>> It comes, however, with a price:
>>>
>>> git history has to be totally rewritten, so if you have a branch/fork of
>>> your own, you have to do a hard reset + rebase/cherry-pick
>>> we lost the nice links in pull requests, the PR author has to manually
>>> post the link back to bintray if someone request the build...
>>>
>>> It's still not 100% finished (for instance pull requests) but you get the
>>> idea. I have also taken the liberty to clean up a few things in the git tree
>>> like doing a real git merge of the branch "usbtos" (way harder than I had
>>> thought...) or removing/squashing few similar/non-source commits (.cvsignore
>>> -> .gitignore for instance).
>>>
>>> I'm writing this in advance to give you time to stop me -- otherwise I'll
>>> do the git force-push sometime on Sunday.
>>>
>>> --
>>> MiKRO / Mystic Bytes
>>> http://mikro.atari.org
>>
>>
>>
>>
>> --
>> MiKRO / Mystic Bytes
>> http://mikro.atari.org
>
>
>
>
> --
> MiKRO / Mystic Bytes
> http://mikro.atari.org
>
> ------------------------------------------------------------------------------
> Check out the vibrant tech community on one of the world's most
> engaging tech sites, Slashdot.org! http://sdm.link/slashdot
> _______________________________________________
> Freemint-discuss mailing list
> Fre...@li...
> https://lists.sourceforge.net/lists/listinfo/freemint-discuss
>