| *** tpb has joined #freeorion | 00:00 | |
| *** mithro has joined #freeorion | 00:37 | |
| *** mithro has quit IRC | 01:50 | |
| *** STalKer-X has quit IRC | 04:18 | |
| *** STalKer-Y has joined #freeorion | 04:19 | |
| *** enig_ has joined #freeorion | 08:57 | |
| *** enigmatic has quit IRC | 08:57 | |
| *** mithro has joined #freeorion | 09:01 | |
| GeofftheMedio | Ingmar: I'm having trouble automatically applying your patches. | 09:32 |
|---|---|---|
| GeofftheMedio | looking at the files, they contain --git parameters, suggesting the format might be intended for use with git rather than SVN | 09:33 |
| Ingmar | diff -p1 ? | 09:33 |
| GeofftheMedio | might that be part of the problem, and if so, can you make SVN compatible patches? | 09:33 |
| GeofftheMedio | is that a question about what you should use? I'm not much of a diff expert, but I when making patches on the command line, I usually did | 09:34 |
| GeofftheMedio | svn diff > filename.patch | 09:34 |
| GeofftheMedio | patching usually required a patch -p0 or similar | 09:34 |
| Ingmar | how're you applying mine? | 09:34 |
| Ingmar | git patches require diff -p1 | 09:35 |
| GeofftheMedio | I'm trying to use the tortoiseSVN apply patch function | 09:35 |
| GeofftheMedio | I've never used git and don't (knowingly) have any way to apply patches with it | 09:35 |
| Ingmar | meh, i'll figure something out, a sec | 09:35 |
| GeofftheMedio | FreeOrion uses SVN for source control, so most submitted patches are made with or at least compatible with it | 09:36 |
| Ingmar | I use git for everything, because everything else sucks :) | 09:36 |
| GeofftheMedio | I'd have thought there'd be a universal diff and/or patch format... | 09:37 |
| Ingmar | GeofftheMedio: http://paste.pocoo.org/raw/167040/ is the gigi patch, can you apply that? | 09:40 |
| GeofftheMedio | doesn't seem to recognize it | 09:41 |
| GeofftheMedio | patches it likes look something like this: http://pastebin.com/d14b51db5 | 09:45 |
| tpb | Title: C++ pastebin - collaborative debugging tool (at pastebin.com) | 09:45 |
| *** mithro_ has joined #freeorion | 09:46 | |
| Ingmar | I'll see what I can do | 09:48 |
| *** mithro has quit IRC | 09:52 | |
| Ingmar | GeofftheMedio: http://paste.pocoo.org/raw/167042/ should work? | 09:54 |
| Ingmar | gah | 09:55 |
| Ingmar | GeofftheMedio: http://paste.pocoo.org/raw/167043/ should work | 09:56 |
| GeofftheMedio | last one seems to have worked | 09:58 |
| Ingmar | oh good | 10:00 |
| Ingmar | I'll do the others after dinner | 10:00 |
| GeofftheMedio | ok, thanks | 10:08 |
| *** mithro_ has quit IRC | 11:16 | |
| STalKer-Y | feature request for tortoisesvn: support for git patches ;) | 11:33 |
| *** bernardh has quit IRC | 12:30 | |
| *** dunno has quit IRC | 12:32 | |
| *** aleksil has quit IRC | 16:41 | |
| *** aleksil has joined #freeorion | 16:41 | |
| *** bernardh has joined #freeorion | 18:14 | |
| *** bernardh has joined #freeorion | 18:14 | |
| *** kroddnoMobil has joined #freeorion | 18:35 | |
| *** ChanServ sets mode: +o kroddnoMobil | 18:35 | |
| *** Magic has joined #freeorion | 19:37 | |
| *** Magic has quit IRC | 20:08 | |
| *** Magic has joined #freeorion | 20:11 | |
| *** bernardh has quit IRC | 20:59 | |
| *** Magic has quit IRC | 21:23 | |
| *** Magic has joined #freeorion | 21:41 | |
| *** mithro has joined #freeorion | 21:43 | |
| *** Magic has quit IRC | 22:01 | |
| *** mithro has quit IRC | 23:06 | |
| *** Ingmar has quit IRC | 23:09 | |
| *** Ingmar has joined #freeorion | 23:12 | |
Generated by irclog2html.py 2.5 by Marius Gedminas - find it at mg.pov.lt!