kicad-developers team mailing list archive

[Ian McInerney <Ian.S.McInerney@xxxxxxxx>]

There are 2 main issues I can see with rebasing:
1) Rebuilding the history will change the commit hashes on master, which
will throw off our 5.1 cherry-picked commit messages that refer to the
master commit they came from (there are at least 4 that this would happen
to).
2) The GitLab merge requests would be completely confused and each
contributor would have to manually fixup their branches and force push to
them to clean it up.

For CI systems and the like, they can just do a shallow clone of the repo
and avoid those commits (at this point we are already 14 commits ahead of
the most recent (a clone of the last 5 commits is only 24.48MiB instead of
the 204.37MiB for a full clone).

-Ian

On Fri, Jan 17, 2020 at 3:49 PM Jon Evans <jon@xxxxxxxxxxxxx> wrote:

> Personally, I think "history is inviolate" doesn't need to apply to things
> that were checked in accidentally, and thus will never need to be merged
> against, diffed, etc.
>
> On Fri, Jan 17, 2020 at 10:48 AM Simon Richter <Simon.Richter@xxxxxxxxxx>
> wrote:
>
>> Hi Seth,
>>
>> On Fri, Jan 17, 2020 at 06:53:46AM -0800, Seth Hillbrand wrote:
>>
>> > >there are two massive blobs that were accidentally checked in, and
>> > >checking
>> > >out the repo requires these to be transferred. Should we make an
>> > >exception
>> > >and rebase the tree to remove them from the history?
>>
>> > I would say no.  History is inviolate.
>>
>> True, but it's a significant chunk of useless history:
>>
>> -r--r--r-- 1 geier geier   5685856 Jan 17 16:40
>> pack-1478d96c882a625a8a6a25cac9ec2b8e514a2e61.idx
>> -r--r--r-- 1 geier geier 157961655 Jan 17 16:40
>> pack-1478d96c882a625a8a6a25cac9ec2b8e514a2e61.pack
>> -r--r--r-- 1 geier geier      1100 Jan 17 16:38
>> pack-81e52eb60810956fd5294dc2fb1ee61ce1aa7438.idx
>> -r--r--r-- 1 geier geier  20734471 Jan 17 16:38
>> pack-81e52eb60810956fd5294dc2fb1ee61ce1aa7438.pack
>> -r--r--r-- 1 geier geier      1100 Jan 17 16:37
>> pack-e18ed50ebfea3897568189f3806d0a2e7051dd37.idx
>> -r--r--r-- 1 geier geier  44601959 Jan 17 16:37
>> pack-e18ed50ebfea3897568189f3806d0a2e7051dd37.pack
>>
>> The largest pack at 160 MB is our development history excluding these two
>> files, the other two are the two files packed individually. They compress
>> fairly well, but this is still 37.5% of our repository size.
>>
>>    Simon
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~kicad-developers
>> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
>> Unsubscribe : https://launchpad.net/~kicad-developers
>> More help   : https://help.launchpad.net/ListHelp
>>
> _______________________________________________
> Mailing list: https://launchpad.net/~kicad-developers
> Post to     : kicad-developers@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~kicad-developers
> More help   : https://help.launchpad.net/ListHelp
>