On Mon, Jun 09, 2014 at 10:51:32PM +0200 I heard the voice of Rhialto, and lo! it spake thus: > > I like it! > > It isn't 100% the way I'd do it myself but it is really close, so > that makes me happy :-) No two people seem to be able to agree on > the exact same style anyway, so I'm quite happy with this.
Yep, that's the name of the code-style game; you'll never find something everybody loves, so settle for something everybody can live with 8-}. And I think I can live with that one. In a little trial of its consistency, I used it to reformat and commit (in scratch locations of course) separately both trunk and your ewmh branch, and then tried merging them. It did wind up having a moderate number of conflicts in the merge, but in a quick look at them they did seem moderately non-spurious. That is, they were all at least in code that had legitimately changed between the branches, though they wouldn't have conflicted sans the reformatting. Most of them ended up being one-sided, which is a little odd. Without being familiar with the changes, they were mostly pretty easy to figure out the resolution of. So, for simplicity we'd still want to minimize outstanding stuff before yanking the lever, but it doesn't immediately seem to below things up too hard. -- Matthew Fuller (MF4839) | [email protected] Systems/Network Administrator | http://www.over-yonder.net/~fullermd/ On the Internet, nobody can hear you scream.
