| *** AlisonChaiken has quit IRC | 02:02 | |
| *** AlisonChaiken has joined #trustable | 03:48 | |
| *** chrispolin- has joined #trustable | 05:13 | |
| *** chrispolin has quit IRC | 05:14 | |
| *** brlogger has joined #trustable | 09:06 | |
| *** locallycompact has quit IRC | 09:27 | |
| *** locallycompact has joined #trustable | 09:58 | |
| *** locallycompact has quit IRC | 10:01 | |
| *** locallycompact has joined #trustable | 10:01 | |
| *** locallycompact has quit IRC | 10:03 | |
| *** locallycompact has joined #trustable | 10:03 | |
| locallycompact | It never occured to me that major version control systems do this incorrectly https://tahoe-lafs.org/~zooko/badmerge/simple.html | 10:11 |
|---|---|---|
| locallycompact | But now that I've seen it I remember I have had this happen before in the Android codebase | 10:11 |
| jmacs | For the benefit of other readers, I did just try it this morning and the merge behaviour in git 2.7.4 is the same as what they call darcs merging | 13:47 |
| jmacs | In other news, Mustard and Doorstop can't be run on the same web server, so I'll have to give up on that | 13:48 |
| paulsherwood | eek. can/should we drop the mustard in favour of doorstop then? | 13:50 |
| jmacs | Maybe. Doorstop's web front end doesn't look as shiny as Mustard's though at the moment and I don't have much data to put in it yet, so I'll work on those before we switch it | 13:52 |
| rjek | jmacs: Why is that? Are they both hard-coded to listen on the same port on the same interface? | 14:13 |
| jmacs | They both work as WSGI applications, and WSGI uses one version of Python per apache instance | 14:15 |
| rjek | Could you run them using a simple WSGI wrapper (that exposes as a web server) and have Apache gateway to it? | 14:18 |
| jmacs | I'm not that familiar with Apache, but I'm trying to get mod_proxy to send requests to a standalone bottle server at the moment | 14:19 |
| *** AlisonChaiken has quit IRC | 14:54 | |
| jmacs | Ok, so http://doorstop.trustable.io is now up, it may go down again for changes and there's no SSL yet. I would like to make some changes to the stylesheets, then I'll publish it on the list | 15:43 |
| *** locallycompact has quit IRC | 17:21 | |
| *** locallycompact has joined #trustable | 19:36 | |
| *** locallycompact has quit IRC | 23:26 | |
Generated by irclog2html.py 2.17.3 by Marius Gedminas - find it at https://mg.pov.lt/irclog2html/!