#exult@irc.freenode.net logs for 6 Mar 2016 (GMT)

Archive Today Yesterday Tomorrow
Exult homepage


[00:35:10] <-- Kirben has left IRC (Quit: System Meltdown)
[00:35:30] --> Kirben has joined #exult
[00:35:30] --- ChanServ gives channel operator status to Kirben
[02:27:34] --> Malignant_Manor has joined #exult
[02:29:14] --> DominusExult has joined #exult
[02:29:14] --- ChanServ gives channel operator status to DominusExult
[02:31:18] <-- Dominus has left IRC (Ping timeout: 240 seconds)
[02:31:18] --- DominusExult is now known as Dominus
[02:33:47] <-- Kirben has left IRC (Quit: System Meltdown)
[02:34:04] --> Kirben has joined #exult
[02:34:04] --- ChanServ gives channel operator status to Kirben
[02:36:21] <Malignant_Manor> Dominus: Are the shp files just exports from the games?
[02:42:26] <-- Malignant_Manor has left IRC (Quit: ChatZilla 0.9.92 [Firefox 44.0.2/20160210153822])
[06:42:44] <Dominus> Malignant, the transparent ones aren't. And some others as well that needed transparency fixes
[09:05:15] --> mixfix41 has joined #exult
[13:25:15] <-- Kirben has left IRC (Quit: System Meltdown)
[16:00:39] <Dominus> wjp, do you have any idea on how to go about pulling in recent SVN to the exult-ios git repository? https://github.com/litchie/exult-ios
[16:01:15] <Dominus> I did just add a patch but that is of course not satisfactory and that commit needs to be replaced eventually, I think
[19:13:43] <Dominus> Marzo: you are into Harry Potter, right? http://www.tickld.com/x/jaw/this-guy-is-pretending-to-be-the-new-it-guy-at-hogwarts-priceless?utm_content=inf_4_93_2&utm_source=tickld&utm_medium=facebook&utm_campaign=contentse&tse_id=INF_0323fec33a054d48a11fdc21e494bdb9
[19:13:55] <Dominus> Hogwarts hired an it guy
[19:23:04] <wjp> Dominus: I think doing that if you haven't set up the original git-svn repository yourself, is rather tricky
[19:23:19] <wjp> unless things have improved in the last couple of years
[19:27:47] <Dominus> Wjp: that's what I feared from reading up on this
[19:28:11] <wjp> you can hack up some things
[19:28:26] <Dominus> I hoped you knew something right away...
[19:28:29] <wjp> well
[19:28:48] <wjp> it depends a bit on how you want to go forward
[19:29:11] <Dominus> Litchie seems to have just set it up and threw everything away
[19:30:13] <Dominus> Probably if I merged it in another fork or so with git-svn thing, I guess
[19:30:15] <wjp> you can probably create a new git-svn clone yourself, and move his commits across to your own git-svn clone
[19:30:48] <wjp> what's most convenient depends a bit on how his history looks in terms of merges
[19:31:31] <wjp> if it's just a simple series of commits without any merging, exporting them to a set of patches (git-format-patch) and importing them into your own with the same base commit (git-am) is probably not so difficult
[19:32:29] <wjp> if it's a more complicated history, you may have to 'trick' git a bit into believing the two separate git-svn histories are the same
[19:35:01] <Dominus> Seems more like it needs the trick
[19:37:15] <wjp> hm, not so sure
[19:37:24] <wjp> only one minor merge
[19:38:26] <wjp> if you do: git format-patch d8f000bf30cfae0fb68144aae6b7beea484aa97d..master
[19:38:37] <wjp> in the exult-ios repo, you get all 84 patches in there as separate files
[19:38:47] <wjp> if you then take a git-svn clone of exult itself
[19:39:15] <wjp> create a new branch at svn revision 7508, and apply all those 84 patches with git-am, ...
[19:39:31] <wjp> ... , you can then merge trunk/master into that branch
[19:40:56] <wjp> (move all those patches into a new dir, and do: git am < /patch-to-new-dir/*.patch )
[19:41:06] <wjp> um, s/patch/path/
[19:41:08] <-- Dominus has left IRC (Ping timeout: 246 seconds)
[19:41:14] <wjp> oh :-)
[19:41:29] --> Dominus has joined #exult
[19:41:29] --- ChanServ gives channel operator status to Dominus
[19:41:41] <wjp> (see logs)
[19:48:48] <Dominus> Thanks, I'll try that later tonight and hope it works!!!
[19:52:31] --> DominusExult has joined #exult
[19:52:31] --- ChanServ gives channel operator status to DominusExult
[19:53:22] <-- Dominus has left IRC (Ping timeout: 246 seconds)
[19:53:22] --- DominusExult is now known as Dominus
[20:06:14] --> DominusExult has joined #exult
[20:06:14] --- ChanServ gives channel operator status to DominusExult
[20:06:16] <-- Dominus has left IRC (Ping timeout: 244 seconds)
[20:08:29] --> Dominus has joined #exult
[20:08:29] --- ChanServ gives channel operator status to Dominus
[20:10:42] <-- DominusExult has left IRC (Ping timeout: 248 seconds)
[20:14:30] <-- Dominus has left IRC (Ping timeout: 252 seconds)
[20:14:38] --> DominusExult has joined #exult
[20:14:38] --- ChanServ gives channel operator status to DominusExult
[20:17:13] --> Dominus has joined #exult
[20:17:13] --- ChanServ gives channel operator status to Dominus
[20:20:11] <-- DominusExult has left IRC (Ping timeout: 276 seconds)
[20:21:12] --> DominusExult has joined #exult
[20:21:12] --- ChanServ gives channel operator status to DominusExult
[20:23:23] <-- Dominus has left IRC (Ping timeout: 268 seconds)
[20:23:38] --> Dominus has joined #exult
[20:23:38] --- ChanServ gives channel operator status to Dominus
[20:25:20] <-- DominusExult has left IRC (Ping timeout: 244 seconds)
[20:28:37] <-- Dominus has left IRC (Ping timeout: 276 seconds)
[20:29:03] --> Dominus has joined #exult
[20:29:03] --- ChanServ gives channel operator status to Dominus
[23:04:08] <Marzo> <wjp> ... , you can then merge trunk/master into that branch
[23:05:09] <Marzo> I think it would be better to rebase the branch instead; that might enable Dominus to do a 'git svn dcommit' after
[23:08:44] <Dominus> Marzo: dcommit would mean that I can commit from the git clone to our SVN?
[23:10:42] <Marzo> If it is all done properly, yes
[23:10:59] <wjp> that sounds rather scary
[23:11:06] <Dominus> yes :)
[23:11:14] <wjp> is it really something you'd want to go into trunk unfiltered?
[23:11:35] <Dominus> especially for me who is prone to break things :)
[23:11:52] <wjp> I'd much prefer just moving to git if we ever want to do such a merge
[23:14:43] <Marzo> What rebase would do in this case is change the order of commits in the branch to be replayed on top of master
[23:15:53] <wjp> I'm well aware
[23:15:54] <Marzo> The rebase probably would stop several times along the way
[23:16:00] <Marzo> For editing conflicts
[23:16:22] <wjp> which is another reason just not to go there
[23:16:28] <Marzo> So I guess it might be better done by someone with a bit more experience
[23:17:38] <Marzo> But speaking of moving to git
[23:17:58] <Dominus> "So I guess it might be better done by someone with a bit more experience" <- yes :)
[23:18:16] <wjp> the patches incidentally are also a bit troublesome because they commit generated files
[23:18:25] <wjp> (headers, vga, flx files)
[23:18:41] <Marzo> Ah, so definitely something to work on
[23:19:55] <Marzo> Anyways: wjp, you had mentioned before that you have the Exult project and organization on GitHub?
[23:19:58] <Dominus> wjp, not to mention that litchie pulled in the whole dependencies (SDL2, ogg/vorbis, png)...
[23:21:07] <Marzo> Hm, so to get his work in we would definitely need an interactive rebase and edit every commit to avoid that stuff
[23:21:20] <Marzo> And perhaps drop some commits along the way
[23:34:11] <wjp> this is getting more in the area of filtering than rebasing, but, yeah
[23:34:26] <wjp> and, yes, I registered the exult project some time ago
[23:38:29] <Marzo> I was thinking of setting up and maintaining a master git-svn repository
[23:40:32] <Marzo> Maybe as a step towards moving to git
[23:41:52] <wjp> what's your github username?
[23:42:12] <Marzo> marzojr
[23:42:28] <Dominus> just move already to git... :)
[23:43:13] <Marzo> I am all for it; would it not be best to consult on the list?
[23:43:48] <wjp> did you get the invitation?
[23:43:48] <Marzo> (although to be fair, everybody even marginally active in Exult is in the channel, at least part of the time)
[23:44:06] <wjp> but we definitely have to consult Jeff
[23:44:16] <wjp> and the list sounds good anyway
[23:44:33] <Marzo> Yes
[23:48:44] <Marzo> wjp: just to confirm, what is your opinion on moving to Git?
[23:55:04] <wjp> go for it
[23:59:50] <Marzo> E-mail sent to the list