Show newer

Here is an example of what this new cherry-picking merge behaviour in looks like:

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 🙄

Show thread

I have committed a small but significant feature to 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).

We at @fsfe are looking for a project manager to support our work to empower people to control technology.

Help us manage and organise larger @fsfe events in the legal, economic, social or political field & support our volunteers

reports! :blobaww:

Marc Espie (espie@) on ports and packages progress

Antoine Jacoutot (ajacoutot@) on porting:

Will post more as they begin to show up!

Post-hackathon activity: Foreging local forests for mushrooms!
(only one of these is edible AFAIK)

So network manager on linux contains 84104 lines of code.

@phessler: "hang on, scroll to the right, we might miss a digit."

So network manager on linux contains 841045 lines of code...

Thanks @qbit for the nice reply and providing the numbers.

IT'S IN!!!!! #openbsd #wifi #g2k18 #hackathon

"""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.

example hostname.if:
join home wpakey password
join work wpakey mekmitasdigoat
join open-lounge
inet6 autoconf

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)

Do you think they used the opportunity to dig in and spread fibreoptics? Of course not. #germany

@alcinnz I can tell you this is not a well organized campaign.

On the publishers' side, though, I am pretty sure that's a different story.

Nobody is asking for exceptions. Wikipedia doesn't want the exception. They want Art13 fixed for everyone. So does everyone else.

Apparently the publishers are going bananas about involvement in . They sent this to ALL MEPs:

I find it absolutely hilarious!

Show thread

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.

I'm in Strasbourg, lobbying hard. Updates soon, but was able to talk to Axel Voss, the main guy behind the current (bad) versions of and . Doing my best to .

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 , MEPs are not entirely against sitting down and discussing the issues.

An important piece of context I'm not sure everybody has: OpenSSH is the single best piece of computer networking software ever made. It is the Swiss army knife of networking, an internet power user's chef's spatula.

I wanna make sure we're on the same page about this.

Show older

Server run by the main developers of the project 🐘 It is not focused on any particular niche interest - everyone is welcome as long as you follow our code of conduct!