A tree conflict occurs because after Subversion 1.7 was branched from trunk, svn's own main C file was renamed in trunk from "main.c" to "svn.c". With my change from today, the resulting tree conflict is now automatically resolved. Previously, the merge stopped after the step "Tree conflict on 'subversion/svn/svn.c':" with SVN complaning that it didn't know how to handle the merge 🙄
I have committed a small but significant feature to #SVN trunk:
Merging a cherry-pick of an edit from a moved file to the file's corresponding pre-move location on an older branch now works out of the box without annoying conflict prompts (beyond a possible text merge conflict, of course).
Öffi is now Open Source \o/
Marc Espie (espie@) on ports and packages progress https://undeadly.org/cgi?action=article&sid=20180716193511
Antoine Jacoutot (ajacoutot@) on porting: https://undeadly.org/cgi?action=article&sid=20180716202456
Will post more as they begin to show up!
Post-hackathon activity: Foreging local forests for mushrooms!
(only one of these is edible AFAIK)
"""Introduce 'auto-join' to the wifi 802.11 stack.
This allows a system to remember which ESSIDs it wants to connect to, any
relevant security configuration, and switch to it when the network we are currently connected to is no longer available.
Works when connecting and switching between WPA2/WPA1/WEP/clear encryptions.
join home wpakey password
join work wpakey mekmitasdigoat
Release announcement posted!
Good night all \o
Goddammit, German police illegally searched CCC property yet again: https://www.ccc.de/de/updates/2018/unrechtmaige-hausdurchsuchung-polizei-reitet-erneut-beim-chaos-computer-club-ein
Well, I broke my x250's power button connector while trying to swap in a new display. Modern laptop cables are too sensitive! (actually I'm just not good at all with hardware)
As a partner organisation of @torservers, we are appalled by the raids at Zwiebelfreunde e.V. and CCC Augsburg.
Raiding houses of witnesses on a flimsy pretext is incompatible with the rule of law – even more so in this case where there is no credible connection between the so-called witnesses and the case.
We suspect that the real motives of the Munich public prosecutor are intimidation and illegal information gathering about freedom activists.
THIS IS IMPORTANT!
We need people to call their MEPs. Most importantly:
- Romanian S&D:
- Romanian EPP:
- British S&D:
- British ECR:
- Italian S&D:
- Polish EPP:
Please report back (in a private message, preferably) what they say! This would help us a LOT!
Lessons from today:
- Pro-Art11/Art13 MEPs do not know how copyright law works (no surprises there, the copyright law is a mess!)
- Wikimedia Commons is a very good example of a service that could suffer very much.
- As during #ACTA, MEPs are not entirely against sitting down and discussing the issues.
Email migrated, setup complete. Huge thanks to @gonzalo for a kickass ansible job!
@mike Some appreciation for your work: https://pauladamsmith.com/blog/2018/07/fixing-bufferbloat-on-your-home-network-with-openbsd-6.2-or-newer.html 👍🏻
(von einem eurer vielen Spender)