--- Log opened Sun Aug 03 00:00:25 2014 20140803 00:04:38-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20140803 00:25:35-!- happygrue [~Laptop@wesnoth/developer/wintermute] has joined #wesnoth-dev 20140803 00:25:52-!- cib0 [~cib@p5DD206E9.dip0.t-ipconnect.de] has quit [Ping timeout: 240 seconds] 20140803 00:33:45-!- Appleman1234 [~Appleman1@pool-173-74-87-52.dllstx.fios.verizon.net] has quit [Remote host closed the connection] 20140803 00:36:03-!- prkc [~prkc@4E5CFB46.dsl.pool.telekom.hu] has quit [Ping timeout: 240 seconds] 20140803 00:37:55-!- Appleman1234 [~Appleman1@pool-173-74-87-52.dllstx.fios.verizon.net] has joined #wesnoth-dev 20140803 00:56:02-!- zookeeper [~lmsnie@wesnoth/developer/zookeeper] has quit [Ping timeout: 245 seconds] 20140803 01:47:28-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has quit [Ping timeout: 250 seconds] 20140803 01:47:52-!- Appleman1234 [~Appleman1@pool-173-74-87-52.dllstx.fios.verizon.net] has quit [Ping timeout: 240 seconds] 20140803 02:01:21-!- Appleman1234 [~Appleman1@pool-173-74-87-52.dllstx.fios.verizon.net] has joined #wesnoth-dev 20140803 02:09:13-!- Ivanovic__ [~ivanovic@frnk-5f7503b5.pool.mediaWays.net] has joined #wesnoth-dev 20140803 02:09:13-!- Ivanovic__ [~ivanovic@frnk-5f7503b5.pool.mediaWays.net] has quit [Changing host] 20140803 02:09:13-!- Ivanovic__ [~ivanovic@wesnoth/developer/ivanovic] has joined #wesnoth-dev 20140803 02:12:41-!- Ivanovic1 [~ivanovic@x2f519f0.dyn.telefonica.de] has joined #wesnoth-dev 20140803 02:13:11-!- Ivanovic [~ivanovic@wesnoth/developer/ivanovic] has quit [Ping timeout: 255 seconds] 20140803 02:13:13-!- Ivanovic__ is now known as Ivanovic 20140803 02:16:03-!- Ivanovic_ [~ivanovic@x2f411a1.dyn.telefonica.de] has quit [Ping timeout: 240 seconds] 20140803 02:17:37-!- gfgtdf [~chatzilla@f054131114.adsl.alicedsl.de] has joined #wesnoth-dev 20140803 02:38:52-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140803 02:44:50-!- gfgtdf [~chatzilla@f054131114.adsl.alicedsl.de] has quit [Quit: ChatZilla 0.9.90.1 [Firefox 31.0/20140716183446]] 20140803 02:54:22-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140803 04:07:19-!- sachith500 [~kvirc@112.135.30.251] has joined #wesnoth-dev 20140803 04:07:19-!- sachith500 [~kvirc@112.135.30.251] has quit [Client Quit] 20140803 04:08:29-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140803 04:33:42-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140803 04:51:56-!- happygrue [~Laptop@wesnoth/developer/wintermute] has quit [Ping timeout: 240 seconds] 20140803 04:55:51-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140803 05:08:25-!- Sulfur [~Miranda@p5B008153.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140803 05:22:46-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has quit [Ping timeout: 264 seconds] 20140803 05:33:51-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20140803 05:44:11-!- riksteri [~riksteri@dsl-tkubrasgw3-54f96b-216.dhcp.inet.fi] has joined #wesnoth-dev 20140803 05:54:27-!- EdB [~edb@85.69.242.6] has joined #wesnoth-dev 20140803 05:57:19-!- [Relic] [~relic@99-58-54-211.lightspeed.milwwi.sbcglobal.net] has quit [Quit: Leaving] 20140803 07:02:04-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140803 07:05:05-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140803 07:08:42-!- thunderstruck [~zaibotren@cpc7-lewi16-2-0-cust662.2-4.cable.virginm.net] has joined #wesnoth-dev 20140803 07:12:38-!- boucman [~rosen@wesnoth/developer/boucman] has joined #wesnoth-dev 20140803 07:33:35-!- Appleman1234 [~Appleman1@pool-173-74-87-52.dllstx.fios.verizon.net] has quit [Ping timeout: 256 seconds] 20140803 07:44:39-!- Appleman1234 [~Appleman1@pool-173-74-87-52.dllstx.fios.verizon.net] has joined #wesnoth-dev 20140803 08:27:55-!- zookeeper [zookeeper@wesnoth/developer/zookeeper] has joined #wesnoth-dev 20140803 08:42:10-!- sachith500 [~kvirc@112.135.232.168] has joined #wesnoth-dev 20140803 08:45:47-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has joined #wesnoth-dev 20140803 08:49:01-!- mjs-de [~mjs-de@p508C9A55.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140803 08:53:44-!- EdB [~edb@85.69.242.6] has quit [Quit: Konversation terminated!] 20140803 09:20:11-!- Zappaman [~Zappaman@92.55.154.101] has joined #wesnoth-dev 20140803 09:28:50< Soliton> zookeeper: does https://gna.org/bugs/?19653 make sense the way it suggests the WML to work? 20140803 09:30:26< Soliton> zookeeper: [music] is just for one track, right? so a shuffle key should be in some parent tag for a music list.. which we don't have? 20140803 09:31:45-!- sachith500 [~kvirc@112.135.232.168] has quit [Quit: KVIrc 4.2.0 Equilibrium http://www.kvirc.net/] 20140803 09:31:53< Soliton> Zappaman: i'm checking out your pull request. 20140803 09:33:43< Soliton> Zappaman: what i don't like of the general idea is that the shuffle behavior is determined by the last [music] tag read. that's confusing and fragile. 20140803 09:37:04< zookeeper> Soliton, ah, i think he's referring only to the [music] action tag 20140803 09:38:13< zookeeper> i'm not sure how exactly he'd intend it to work, though 20140803 09:38:49< Soliton> action tag means whatever is under [event], right? 20140803 09:38:53< zookeeper> yeah 20140803 09:40:26< Soliton> on thaat note the music macros seem a bit silly in that they repeat all music tracks under [event] without using another macro. 20140803 09:41:07< Soliton> at least afaics it's exactly the same WML. 20140803 09:41:16< fabi__> hello 20140803 09:42:19< zookeeper> Soliton, yeah it's a bit of a cludge currently, most likely to get the music to play in story screens or something 20140803 09:43:00< Soliton> the [event] stuff is so the music list is reset after [story] afaiu, yeah. 20140803 09:44:26< zookeeper> i'm really not sure what's the best way to implement shuffling... putting it in the [music] tag feels weird because as you said, each [music] tag is just one track in the list 20140803 09:44:30< Soliton> the question is how/where the shuffle option should be used. adding it to [music] means the last music tag read decides which is not particularly nice. 20140803 09:45:18< Zappaman> hey guys, thanks for the interest in my pull request! So basically, the initial proposal of adding a shuffle key isn't that inspired you say? 20140803 09:45:19< Soliton> maybe it should be a scenario wide option? that's the semantic of it, i think. 20140803 09:45:33< zookeeper> at scenario-level would make sense... but then you can't toggle shuffling on/off during a scenario, which someone would surely want to do sooner or later 20140803 09:45:59< Soliton> Zappaman: yeah, something like that. 20140803 09:46:57< Soliton> zookeeper: so we'd have to implement an action tag for that? 20140803 09:47:16< Soliton> and we already have the music action tag... 20140803 09:47:34< zookeeper> i think putting it to [music] would easily allow people to do whatever they want, but it's just a bit unintuitive there 20140803 09:48:05< zookeeper> maybe we could just spec it so that if you got shuffle= in [music], everything else is ignored and it'll only toggle the playlist shuffling on or off? 20140803 09:48:51< zookeeper> that's probably no simpler to implement than just a new action tag, though 20140803 09:49:00< Soliton> another thing to consider there is that if you have no such tag you get the behavior from the previos scenario. 20140803 09:49:17< Soliton> which can be anything. 20140803 09:49:28< zookeeper> right 20140803 09:49:57< Soliton> well, i guess the suggested way is ok under the circumstances then. 20140803 09:50:11< Soliton> just needs to be well documented. 20140803 09:52:17< Soliton> Zappaman: do you know if the code you added is just for [music] in [event] or toplevel [music] as well? 20140803 09:52:38-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140803 09:52:45< Soliton> i'm guessing the latter. 20140803 09:53:29< Zappaman> i did not treat the [event] tag in any specific way, so I would say the latter as well. 20140803 09:54:37< Soliton> the WML change you temporarily added was just under [event] is why i ask. 20140803 09:55:09< Soliton> any simple way to test the change? 20140803 09:57:10< Soliton> zookeeper: other imaginable behavior would be that the shuffle key decides how the next track is chosen. so if currently a track with shuffle=yes plays the next one is chosen randomly otherwise the next in the list gets played. 20140803 09:57:33< Soliton> that way it'd make sense that the key is under [music]. 20140803 09:58:30< Zappaman> adding this to the default music playlist just before the [event] tag should do the trick 20140803 09:59:26< Soliton> does the test scenario use the default play list? 20140803 09:59:26< zookeeper> Soliton, yeah, i guess that could work. but if you wanted even the first track to be shuffled, you'd have to make the first track a short blank one, right? 20140803 10:00:35< Soliton> zookeeper: since shuffling is the default playing the first track initially would be the issue but yeah. hmm... 20140803 10:03:00< Zappaman> Soliton: you mean the tutorial scenario? 20140803 10:04:05< Soliton> Zappaman: no, wesnoth --test 20140803 10:04:18< zookeeper> hmh... 20140803 10:07:26< zookeeper> what if: when deciding the next track, it always looks at the next item in the list (or the first item when starting the scenario), and if that item has shuffle=yes (default), it'll jump to a random item instead (but only one such hop at a time, of course). 20140803 10:08:07< zookeeper> if the item has shuffle=no, then it just plays that one 20140803 10:17:52-!- cib0 [~cib@p5DC75B0C.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140803 10:20:15-!- mjs-de [~mjs-de@p508C9A55.dip0.t-ipconnect.de] has quit [Remote host closed the connection] 20140803 10:20:44-!- cib0 [~cib@p5DC75B0C.dip0.t-ipconnect.de] has quit [Client Quit] 20140803 10:21:41< Zappaman> Soliton: I've tested the behaviour in the tutorial scenario, and it seems that the shuffle key i've added works only in the [event] tag. adding shuffle=no in the same macro, but before the [event] tag, did not un-shuffle it, sorry for the confusion. 20140803 10:22:04< Soliton> ok, i see. 20140803 10:28:50< Soliton> Zappaman: what i would do next is check out where the top level [music] tag is read/used. depending on the outcome add the same logic there or decide the feature is just for [event] tags. independently of that move the shuffle option into music_track where it belongs and implement what zookeeper suggested as the shuffle behavior. 20140803 10:32:05-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140803 10:32:58< Soliton> and by "what i would do" i mean what you could do so that i just have to press the merge button later. ;-) 20140803 10:35:11< Zappaman> Soliton: ok, thanks a lot for the advice! one question: "move the shuffle option into music_track where it belongs" means you would like to move the c++ code in sound_music_track, or are you referring to another WML tag? (a bit confused) 20140803 10:36:14< Soliton> sound::music_track the c++ class. 20140803 10:36:41< Zappaman> Ok, thanks again! 20140803 10:36:48< Soliton> what's currently not nice is that we have a music_track current_track and int track. 20140803 10:37:18< Soliton> ideally everything should be in current_track. 20140803 10:37:44< Soliton> or if that is really not easy at least rename track to current_track_index or so. 20140803 10:38:39< Soliton> and the shuffle option needs to move there if we don't just want the last music tag to decide the behaviour but each tag as zookeeper described. 20140803 10:41:05< Zappaman> Thanks a lot for the tips, I'll look into it. 20140803 11:08:40-!- prophile [~alynn@oftn/member/prophile] has quit [Read error: Connection reset by peer] 20140803 11:09:14-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140803 11:10:26-!- prophile [~alynn@oftn/member/prophile] has quit [Read error: Connection reset by peer] 20140803 11:10:59-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140803 11:26:45-!- bumbadadabum [~bumbadada@d155109.upc-d.chello.nl] has joined #wesnoth-dev 20140803 11:40:19-!- cib0 [~cib@p5DC75B0C.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140803 11:46:20-!- happygrue [~Laptop@wesnoth/developer/wintermute] has joined #wesnoth-dev 20140803 11:51:18-!- cib0 [~cib@p5DC75B0C.dip0.t-ipconnect.de] has quit [Remote host closed the connection] 20140803 11:55:12-!- Sulfur [~Miranda@p5B008153.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20140803 12:12:32-!- sachith500 [~kvirc@112.135.88.109] has joined #wesnoth-dev 20140803 12:21:12-!- prkc [~prkc@5400642E.dsl.pool.telekom.hu] has joined #wesnoth-dev 20140803 12:29:23-!- sachith500 [~kvirc@112.135.88.109] has quit [Read error: Connection reset by peer] --- Log opened Sun Aug 03 12:55:59 2014 20140803 12:56:10-!- lobby [~wesnoth@wesnoth/bot/lobby] has joined #wesnoth-dev 20140803 12:56:10-!- Topic for #wesnoth-dev: 1.12 RC1 (aka 1.11.17) planned for Saturday, 2nd Aug | string+feature freeze active on 1.12 | 248 bugs, 344 feature requests, 29 patches | Logs: http://irclogs.wesnoth.org | Alternate logs: http://wesnoth.debian.net | Don't paste on IRC! Use a pastebin: http://pastebin.com | http://imagebin.org 20140803 12:56:10-!- Topic set by wesbot [~wesbot@wesnoth/bot/wesbot] [Sat Aug 2 19:50:54 2014] 20140803 12:56:10[Users #wesnoth-dev] 20140803 12:56:10[ AI0867 ] [ EliDupree_] [ lobby ] [ shikadibot ] 20140803 12:56:10[ Alkenrinnstet ] [ enchilado ] [ loonycyborg ] [ Smar ] 20140803 12:56:10[ apoi ] [ esr ] [ LovCAPONE ] [ thunderstruck] 20140803 12:56:10[ Appleman1234 ] [ fabi__ ] [ MaraJade ] [ timotei_ ] 20140803 12:56:10[ Ardonik ] [ Fortescue ] [ matthiaskrgr] [ ToBeFree ] 20140803 12:56:10[ boucman ] [ Gambit ] [ molgrum ] [ tomreyn ] 20140803 12:56:10[ bumbadadabum ] [ Guest92115] [ nurupo ] [ Turuk ] 20140803 12:56:10[ c74d ] [ Haudegen ] [ prkc ] [ vultraz ] 20140803 12:56:10[ Coffee_irc ] [ higgins ] [ prophile ] [ wesbot ] 20140803 12:56:10[ Crendgrim ] [ Ivanovic ] [ Rhonda ] [ yann ] 20140803 12:56:10[ crimson_penguin] [ Ivanovic1 ] [ RiftWalker ] [ Zappaman ] 20140803 12:56:10[ DCW ] [ iwaim ] [ riksteri ] [ zookeeper ] 20140803 12:56:10[ DDR ] [ janebot ] [ ryao ] [ {V} ] 20140803 12:56:10[ DHost_ ] [ Jetrel ] [ Samual ] 20140803 12:56:10[ elias ] [ knotwork_ ] [ shadowm ] 20140803 12:56:10-!- Irssi: #wesnoth-dev: Total of 58 nicks [0 ops, 0 halfops, 0 voices, 58 normal] 20140803 12:56:38-!- Channel #wesnoth-dev created Tue Jan 27 05:28:41 2009 20140803 12:57:46-!- Irssi: Join to #wesnoth-dev was synced in 106 secs 20140803 13:02:12-!- Sulfur [~Miranda@p5B008153.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140803 13:04:46-!- DCW [~Thunderbi@cpc66863-finc15-2-0-cust393.4-2.cable.virginm.net] has quit [Ping timeout: 244 seconds] 20140803 13:05:06-!- Soliton [~Soliton@wesnoth/developer/soliton] has joined #wesnoth-dev 20140803 13:06:58-!- DCW [~Thunderbi@cpc66863-finc15-2-0-cust393.4-2.cable.virginm.net] has joined #wesnoth-dev 20140803 13:10:24-!- cib0 [~cib@p5DC75B0C.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140803 13:17:53-!- sachith500 [~kvirc@112.135.88.109] has joined #wesnoth-dev 20140803 14:04:02-!- DCW [~Thunderbi@cpc66863-finc15-2-0-cust393.4-2.cable.virginm.net] has quit [Remote host closed the connection] 20140803 14:42:11-!- sachith500 [~kvirc@112.135.88.109] has quit [Read error: Connection reset by peer] 20140803 14:42:30-!- sachith500 [~kvirc@112.135.88.109] has joined #wesnoth-dev 20140803 14:44:29-!- sachith500 [~kvirc@112.135.88.109] has quit [Client Quit] 20140803 14:52:11-!- Guest92115 [~rthj@67.110.212.8.ptr.us.xo.net] has quit [Ping timeout: 264 seconds] 20140803 15:40:13-!- gfgtdf [~chatzilla@f054131114.adsl.alicedsl.de] has joined #wesnoth-dev 20140803 15:40:15< gfgtdf> wesbot: seen mattsc 20140803 15:40:16< wesbot> gfgtdf: The person with the nick mattsc last spoke 13d 13h ago. 9d 21h ago was here and on the channels #wesnoth, #wesnoth-de and #wesnoth-umc-dev with the message: Quit: Traveling and mostly out of contact until Aug 11 20140803 15:40:24-!- gfgtdf [~chatzilla@f054131114.adsl.alicedsl.de] has quit [Client Quit] 20140803 15:43:16-!- Sulfur [~Miranda@p5B008153.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20140803 16:05:56-!- Sulfur [~Miranda@p5B008153.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140803 16:47:29-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140803 16:47:42-!- prophile [~alynn@oftn/member/prophile] has quit [Read error: Connection reset by peer] 20140803 16:48:16-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140803 16:48:54-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Client Quit] 20140803 17:50:50-!- cib0 [~cib@p5DC75B0C.dip0.t-ipconnect.de] has quit [Ping timeout: 260 seconds] 20140803 17:51:19-!- cib0 [~cib@p5DC75B0C.dip0.t-ipconnect.de] has joined #wesnoth-dev 20140803 17:59:59-!- knotwork_ [~markm@unaffiliated/knotwork] has quit [Read error: Connection reset by peer] 20140803 18:00:30-!- knotwork_ [~markm@142.68.132.168] has joined #wesnoth-dev 20140803 18:00:30-!- knotwork_ [~markm@142.68.132.168] has quit [Changing host] 20140803 18:00:30-!- knotwork_ [~markm@unaffiliated/knotwork] has joined #wesnoth-dev 20140803 18:07:12-!- riksteri [~riksteri@dsl-tkubrasgw3-54f96b-216.dhcp.inet.fi] has quit [Quit: riksteri] 20140803 18:07:58-!- prophile [~alynn@oftn/member/prophile] has quit [Quit: The Game] 20140803 18:15:02-!- Sulfur [~Miranda@p5B008153.dip0.t-ipconnect.de] has quit [Read error: Connection reset by peer] 20140803 18:18:08-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140803 18:56:00-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140803 18:58:30-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140803 19:00:37-!- prophile [~alynn@oftn/member/prophile] has joined #wesnoth-dev 20140803 19:00:53-!- thunderstruck [~zaibotren@cpc7-lewi16-2-0-cust662.2-4.cable.virginm.net] has quit [Ping timeout: 240 seconds] 20140803 19:07:11-!- shadowm_desktop [ignacio@wesnoth/developer/shadowm] has joined #wesnoth-dev 20140803 19:11:12-!- gfgtdf [~chatzilla@f054131114.adsl.alicedsl.de] has joined #wesnoth-dev 20140803 19:12:31< gfgtdf> are there advantages of util::scoped_ptr over boost::scoped_ptr ? It seems like at least msvc doesn't liek util::scoped_ptr to be used with incomplete types because of the virtual destructor. 20140803 19:13:18-!- thunderstruck [~zaibotren@cpc7-lewi16-2-0-cust662.2-4.cable.virginm.net] has joined #wesnoth-dev 20140803 19:27:17-!- mjs-de [~mjs-de@f049065022.adsl.alicedsl.de] has joined #wesnoth-dev 20140803 19:29:23< AI0867> gfgtdf: isn't that only old versions of msvc? 20140803 19:31:44< gfgtdf> AI0867: i use msvc 2010 i have the same problem as here: http://stackoverflow.com/questions/6510323/can-a-templated-pointer-class-have-a-virtual-destructor 20140803 19:32:28-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140803 19:35:58-!- Turuk [~Turuk@wesnoth/forum-moderator/turuk] has quit [Quit: Turuk] 20140803 19:36:40-!- ancestral [~ancestral@12.23.74.29] has quit [Quit: i go nstuf kthxbai] 20140803 19:38:40-!- thunderstruck [~zaibotren@cpc7-lewi16-2-0-cust662.2-4.cable.virginm.net] has quit [Ping timeout: 255 seconds] 20140803 19:41:56-!- Turuk [~Turuk@wesnoth/forum-moderator/turuk] has joined #wesnoth-dev 20140803 19:44:23-!- Turuk [~Turuk@wesnoth/forum-moderator/turuk] has quit [Client Quit] 20140803 19:49:06-!- trewe [~trewe@bl20-30-88.dsl.telepac.pt] has joined #wesnoth-dev 20140803 19:50:53-!- ancestral [~ancestral@adsl-76-248-166-148.dsl.pltn13.sbcglobal.net] has joined #wesnoth-dev 20140803 19:50:54-!- wesbot changed the topic of #wesnoth-dev to: 1.12 RC1 (aka 1.11.17) planned for Saturday, 2nd Aug | string+feature freeze active on 1.12 | 249 bugs, 340 feature requests, 29 patches | Logs: http://irclogs.wesnoth.org | Alternate logs: http://wesnoth.debian.net | Don't paste on IRC! Use a pastebin: http://pastebin.com | http://imagebin.org 20140803 20:03:41-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Read error: Connection reset by peer] 20140803 20:03:53-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140803 20:07:13< Zappaman> Hey guys, got a bit of a problem, and I'm need of some advice, please: I've pushed some commits to a pull request that was a bit dated, but before that I synced the branch for the pull request to wesnoth's master, and now my pull request is a bit of a mess, as can be seen here: https://github.com/wesnoth/wesnoth/pull/255 . Should I just close it and start a new one? Or is there any way to 20140803 20:07:15< Zappaman> fix this up somehow? Thanks for the help! 20140803 20:10:16-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Read error: Connection reset by peer] 20140803 20:10:34-!- stikonas [~gentoo@wesnoth/translator/stikonas] has joined #wesnoth-dev 20140803 20:32:59-!- tomreyn [~tomreyn@megaglest/team/tomreyn] has quit [Quit: tomreyn] 20140803 20:36:38-!- cib0 [~cib@p5DC75B0C.dip0.t-ipconnect.de] has quit [Quit: Leaving] 20140803 20:48:44-!- trewe [~trewe@bl20-30-88.dsl.telepac.pt] has quit [Quit: quit] 20140803 20:59:14-!- EdB [~edb@85.69.242.6] has joined #wesnoth-dev 20140803 21:06:11-!- ancestral [~ancestral@adsl-76-248-166-148.dsl.pltn13.sbcglobal.net] has quit [Quit: i go nstuf kthxbai] 20140803 21:06:21< AI0867> Zappaman: you should rebase your branch on master, then force push to your own branch 20140803 21:09:53< Zappaman> AI0867: I tried that, but I couldn't rebase, and it got really messy altogether, so I just decided to close the pull request and start a new one, providing a link in the description to the old pull request. Anyway my newest commit basically changed the entire implementation, so I figured this was the best thing to do. 20140803 21:10:16-!- ancestral [~ancestral@adsl-76-248-166-148.dsl.pltn13.sbcglobal.net] has joined #wesnoth-dev 20140803 21:17:17-!- RiftWalker [~nathan@ip98-163-252-45.no.no.cox.net] has quit [Quit: Lost terminal] 20140803 21:24:34-!- gfgtdf_ [~chatzilla@d221093.adsl.hansenet.de] has joined #wesnoth-dev 20140803 21:26:35-!- gfgtdf [~chatzilla@f054131114.adsl.alicedsl.de] has quit [Ping timeout: 256 seconds] 20140803 21:26:44-!- gfgtdf_ is now known as gfgtdf 20140803 21:26:48< AI0867> Zappaman: well, you have a new branch then? 20140803 21:26:57< AI0867> you can force push *that* branch too, if you'd like 20140803 21:27:04< AI0867> that is, to the same remote 20140803 21:31:22-!- stikonas [~gentoo@wesnoth/translator/stikonas] has quit [Quit: Konversation terminated!] 20140803 21:31:41< Zappaman> Oh, I thought that somehow each pull request is attached to the same branch, and that I couldn't simply push another branch to it. Simply pushing a new branch to it would have solved my problems you say? 20140803 21:32:11< AI0867> well, a pull request is from a branch to a branch 20140803 21:32:20< AI0867> but these are remote branches, on github 20140803 21:32:36< shadowm> Force pushing a branch means overwriting it. 20140803 21:33:01< AI0867> if have branch A on your machine, it's perfectly possible to push it to remote branch B 20140803 21:34:41< Zappaman> and overwrite it, and solve the problem 20140803 21:36:28< Zappaman> Well, thinking about, I should have probably gone with force pushing to it. 20140803 21:52:52-!- ancestral [~ancestral@adsl-76-248-166-148.dsl.pltn13.sbcglobal.net] has quit [Quit: i go nstuf kthxbai] 20140803 21:54:16-!- EdB [~edb@85.69.242.6] has quit [Quit: Konversation terminated!] 20140803 21:55:27-!- boucman [~rosen@wesnoth/developer/boucman] has quit [Remote host closed the connection] 20140803 22:00:23-!- Zappaman [~Zappaman@92.55.154.101] has quit [] 20140803 22:20:02-!- ancestral [~ancestral@12.23.74.29] has joined #wesnoth-dev 20140803 22:30:04-!- Smar [smar@freenet/translator/finnish/Smar] has quit [Remote host closed the connection] 20140803 22:30:21-!- Smar [smar@nano.smar.fi] has joined #wesnoth-dev 20140803 22:30:21-!- Smar [smar@nano.smar.fi] has quit [Changing host] 20140803 22:30:21-!- Smar [smar@freenet/translator/finnish/Smar] has joined #wesnoth-dev 20140803 22:49:29-!- mjs-de [~mjs-de@f049065022.adsl.alicedsl.de] has quit [Remote host closed the connection] 20140803 23:01:03-!- prophile [~alynn@oftn/member/prophile] has quit [Quit: The Game] 20140803 23:08:04-!- Coffee_irc [~david@ppp118-210-28-97.lns20.adl2.internode.on.net] has quit [Ping timeout: 240 seconds] 20140803 23:14:04-!- SpoOkyMagician [~chatzilla@cpe-74-136-58-34.swo.res.rr.com] has joined #wesnoth-dev 20140803 23:46:52-!- zookeeper [zookeeper@wesnoth/developer/zookeeper] has quit [Ping timeout: 245 seconds] --- Log closed Mon Aug 04 00:00:58 2014