17:11:48 <franciscod> #startmeeting
17:11:49 <zodbot> Meeting started Sun Mar  7 17:11:48 2010 UTC.  The chair is franciscod. Information about MeetBot at http://wiki.debian.org/MeetBot.
17:11:51 <zodbot> Useful Commands: #action #agreed #halp #info #idea #link #topic.
17:12:07 <franciscod> #topic final merge to get master on the road ;)
17:12:17 <Subfusc> with smiley
17:12:18 <Subfusc> i like that
17:12:19 <Subfusc> =P
17:12:36 <franciscod> Subfusc: i got your branch up to date, pulled it, you got mine?
17:12:51 <franciscod> pull it up once just to be sure please?
17:13:04 <Subfusc> i cloned it yesterday
17:13:34 <franciscod> Subfusc: okay, lets begin then
17:13:42 * franciscod opens two screens with the two branches
17:14:13 * Subfusc opens franciscod's branch
17:14:17 <Subfusc> i know how mine looks like
17:14:18 <Subfusc> :p
17:14:20 <franciscod> Subfusc: we need to get rid of frontend 1 completely
17:14:23 <franciscod> :P
17:14:24 <Subfusc> yes
17:14:36 <Subfusc> neither i nor you has that folder anymore
17:14:51 <franciscod> your branch has frontend1, is it all useless stuff?
17:14:56 <Subfusc> no
17:15:04 <Subfusc> my branch does not have frontend 1
17:15:08 <Subfusc> :P
17:15:11 <franciscod> O_o
17:15:28 <franciscod> Subfusc: http://fpaste.org/mDeE/
17:15:29 <franciscod> :(
17:15:45 <franciscod> thats ls within your branch :(
17:15:53 <Subfusc> thats probably an extremly old commit
17:16:00 <franciscod> i just pulled
17:16:09 <Subfusc> franciscod: go to a new folder
17:16:14 <Subfusc> and run the following command:
17:16:24 <Subfusc> git clone <git adress> subfusc
17:16:38 <franciscod> Subfusc: thats what i did, ill do it again then, wait
17:16:43 <Subfusc> [sin@main fedora-tour]$ ls
17:16:43 <Subfusc> backend  data  docs  fedora-tour.py  frontend
17:16:51 <Subfusc> that is the ls of my dir now
17:17:10 <franciscod> Subfusc: git clone ssh://ankursinha@fedorahosted.org/git/fedora-tour.git subfusc
17:17:13 <franciscod> correct?
17:17:14 <franciscod> ^^ ?
17:17:23 <Subfusc> no
17:17:24 <Subfusc> =P
17:17:31 <franciscod> lose the username part?
17:17:36 <Subfusc> git clone ssh://ankursinha@fedorahosted.org/git/fedora-tour.git -b subfusc
17:17:37 <Subfusc> ;)
17:17:49 <Subfusc> if not your cloning master branch into a folder named subfusc
17:17:55 <franciscod> heh
17:17:56 <franciscod> okay
17:17:58 <franciscod> gimem a min
17:18:58 <franciscod> this is going to take time, i got a 30KBps cap :|
17:19:11 <Subfusc> lol, why? XD
17:19:21 <franciscod> all i can afford here at college
17:19:28 <Subfusc> >_<
17:19:35 <franciscod> the wifi they give doesnt supprt any protocol other than http lol
17:19:35 <Subfusc> we get free internettz from the Uni
17:19:42 <Subfusc> 10Mbit SDSL
17:19:47 * franciscod cries
17:19:57 <Subfusc> most of the ports are blocked
17:20:09 <Subfusc> but thats not a problem for anyone that knows how to use a computer
17:20:12 <franciscod> heh
17:20:26 <franciscod> i havent really gotten into that yet, dont really care
17:20:34 <Subfusc> into what?
17:20:45 <franciscod> what ports theyve blocked etc
17:20:48 <Subfusc> ah
17:21:05 <Subfusc> if you got 10Mbit sdsl and a ssh server, you care :P
17:21:10 <franciscod> heh
17:21:24 <franciscod> it isnt a 10Mbit anyway
17:21:45 <franciscod> on good times, yum gives me 60KBps on the Uni connection
17:21:48 <franciscod> thats max
17:22:01 <Subfusc> oh, at the uni
17:22:03 <Subfusc> this is home
17:22:06 <franciscod> and the uni net is shutdown after midnight :x
17:22:14 <Subfusc> at the uni we got 1Gbit/S
17:22:15 <Subfusc> :P
17:22:23 <franciscod> :D
17:22:47 <franciscod> Subfusc: btw, i saw rrix around on #fedora-kde during the day
17:22:53 <franciscod> was hoping he'd make it here
17:23:07 <Subfusc> sometimes i have a feeling he is ignoring us >_>
17:23:25 <franciscod> nah, he's just pretty busy i guess
17:23:33 <franciscod> hes got a FAD coming up too
17:23:47 <franciscod> think he's gotta pick up mchua near midnight or something on Friday
17:24:06 <franciscod> he can always catch up later
17:24:16 <franciscod> starting with making his branch :P
17:24:40 <Subfusc> oh btw, talking about pick up, did you read about the new Linux Motorcycle from norway? :P
17:24:51 <franciscod> where??????
17:25:09 <Subfusc> it was in our newspapers (offcourse beeing in norway)
17:25:12 <franciscod> heh
17:25:21 <Subfusc> So i hoped the news had gotten futher
17:25:40 <Subfusc> but yeah, its a pretty awsome project, linux in an electric motorcycle
17:25:43 * Subfusc want one
17:25:56 <Subfusc> with mobile internett
17:26:04 * franciscod is drooling
17:26:45 <franciscod> Subfusc: http://www.linuxpromagazine.com/Online/News/130-mph-Linux-Motorcycle
17:26:48 <franciscod> that ?
17:27:05 <Subfusc> nope
17:27:06 <franciscod> Subfusc: how big is your branch?
17:27:17 <franciscod> 13mb and still going :|
17:27:39 <Subfusc> http://www.engadget.com/2010/03/04/electric-green-school-motorcycle-shows-its-rebel-nature-by-runni/
17:27:52 <Subfusc> franciscod: it is smaller than yours ;)
17:28:07 <franciscod> after my "housekeeping"?
17:28:55 <Subfusc> well if you take away the redundant file, it would be
17:29:07 <Subfusc> but i havent done that in respect to you guys
17:29:11 <Subfusc> so right now its probably bigger
17:29:27 <franciscod> Subfusc: done
17:29:29 <franciscod> :D
17:29:31 <Subfusc> :D
17:29:58 <franciscod> Subfusc: youre not going to like this,
17:30:03 <franciscod> it still has the frontend1 folder
17:30:05 <franciscod> :(
17:30:18 <franciscod> Subfusc: git clone ssh://ankursinha@fedorahosted.org/git/fedora-tour.git -b subfus
17:30:21 <franciscod> thats the command i ran
17:30:27 <franciscod> subfisc
17:30:30 <franciscod> grrr
17:30:32 <Subfusc> haha
17:30:35 <franciscod> "Subfusc" at end
17:30:39 <franciscod> now what me do wrong?
17:30:41 <Subfusc> small s
17:30:46 <Subfusc> do git branch
17:30:52 <Subfusc> and show me what you get as output
17:30:59 <franciscod> Subfusc with small s
17:31:10 <franciscod> with an * before it
17:31:13 <Subfusc> then it should be the correct branch atleast
17:31:18 <franciscod> ;'(
17:31:23 <Subfusc> it still got frontend 1?
17:31:32 * franciscod nods
17:31:47 <franciscod> thomtthing wrong thomwhere
17:31:53 * Subfusc tries to pull his own branch
17:32:13 <franciscod> do it in a new folder
17:32:22 <franciscod> me did it last time and screwd all my changes :|
17:33:01 <Subfusc> your right ....
17:33:12 <Subfusc> let me push my changes again
17:33:16 <franciscod> okie
17:34:46 <franciscod> tell me when youre done, ill re pull
17:38:56 <Subfusc> i get everything upto date
17:38:58 <Subfusc> wtf
17:39:39 <Subfusc> ill make some changes then
17:39:44 <Subfusc> fucking tard git
17:40:45 <franciscod> lol
17:41:00 <franciscod> im happy to see someone apart from me having git trouble :P :P :P
17:42:38 <Subfusc> wait
17:42:41 <Subfusc> i might see the problem
17:43:29 <franciscod> what is it?
17:44:14 <franciscod> is it some fast forwarding thign? i got that a lot :|
17:44:16 <Subfusc> https://fedorahosted.org/fedora-tour/changeset/b8794d4f64dfefd8397b3e83adb8d69a3075bff8
17:44:20 <Subfusc> there
17:44:33 <Subfusc> for some reason, my git commented out the delete files
17:44:38 <franciscod> thats the problem?
17:44:43 <franciscod> or is it done?
17:44:43 <franciscod> :P
17:44:56 <Subfusc> yeah it should be correct now
17:44:59 <Subfusc> let me try and clone
17:45:05 <franciscod> me cloning too
17:45:19 * franciscod looks at it and waits
17:45:41 <Subfusc> yeah
17:45:42 <Subfusc> now its correct
17:45:43 <Subfusc> :P
17:46:25 <franciscod> c l o n i n g
17:46:46 <franciscod> Subfusc: it said "counting objects 713"
17:46:56 <franciscod> then compressing "627/627"
17:47:10 <franciscod> generally asking, arent they supposed to be the same in number?
17:47:11 <Subfusc> yes, does the same here
17:47:27 <Subfusc> i have no idea how git does the transfer
17:47:27 <Subfusc> =P
17:48:04 <franciscod> heh
17:48:05 <franciscod> okay
17:48:12 <franciscod> dont really care, as long as it works right :)
17:48:20 <Subfusc> right now, yes
17:48:25 <Subfusc> git is faggotry
17:48:26 <Subfusc> =P
17:48:41 <Subfusc> but atleast its better than svn, cvn and mercurial
17:48:45 <Subfusc> or what its name
17:48:47 <franciscod> i havent used them stuff
17:49:04 <Subfusc> its a hard task to manage code in this manner
17:49:12 <Subfusc> so you cant realy blame them for making it hard
17:49:12 <franciscod> #agree
17:49:27 <Subfusc> because it is hard
17:49:28 <Subfusc> =P
17:49:29 <franciscod> we'll get used to it in sometime <hopefully>
17:49:39 <Subfusc> yeah, i hope so
17:50:12 <franciscod> 2 more minutes for clone to finish <sigh>
17:50:50 * Subfusc doesnt envy franciscod his slow intrawebs
17:51:44 <franciscod> Subfusc: you gotta teach me how to find ports etc on my uni net once we're done with this stuff
17:52:21 <Subfusc> franciscod: i searched on the web, my uni has a document about it
17:52:33 <franciscod> heh
17:52:38 <Subfusc> then i just made a small client server program to check that the ports are realy open
17:52:41 <Subfusc> ;P
17:52:45 <franciscod> these people havent told us anything about how they worl
17:53:08 <Subfusc> you could use my program to test common ports
17:53:11 <franciscod> i heard they were using a squid proxy or something
17:53:29 * franciscod got no clue on this stuff
17:53:43 <Subfusc> what do you intend to do anyways?
17:54:22 <franciscod> Subfusc: heh, try using the uni net for day to day use, i dont use it because only browsing works :|
17:54:34 <franciscod> Subfusc: clone complete, time to work :)
17:54:43 <Subfusc> so they have only opened port 80?
17:54:44 <Subfusc> kk
17:55:04 <Subfusc> did you get the correct branch this time? =P
17:55:10 <Subfusc> no frontend 1
17:55:12 <Subfusc> ?
17:55:34 <franciscod> yeah no frontend1
17:55:49 <Subfusc> woho
17:55:53 * Subfusc does a victory dance
17:55:57 <franciscod> Subfusc: yeah, i think only 80, forget it for the timebeing, shitty net, not worth wasting time on
17:57:15 <franciscod> Subfusc: http://fpaste.org/QNX7/
17:57:20 <franciscod> hardly any difference :)
17:57:35 <franciscod> most of them are naming changes etc
17:57:49 <Subfusc> the major diffrence are naming changes and fedora-tour.py
17:58:26 <Subfusc> and Splash vs your gtk-splash (they are the same file)
17:58:54 <franciscod> yeah
17:59:08 <franciscod> the fedora-tour.py has only subtle differences too
17:59:24 <Subfusc> yeah, as i said i edited the Splash to be selfreliant
17:59:32 <franciscod> my version uses rrix 's dynamic import thing, and yours doesnt, apart from that, its again naming
17:59:51 <Subfusc> i dont think we need the dynamic import stuff
18:00:00 <Subfusc> i think its a waste
18:00:01 <Subfusc> tbh
18:00:06 <franciscod> heh
18:00:14 <Subfusc> its not Qt vs Gtk
18:00:19 <Subfusc> or Clutter vs OpenGL
18:00:22 <Subfusc> or whatever
18:00:24 <franciscod> i got no idea what is for, ill hang around on #python and find out later sometime
18:00:37 <franciscod> Subfusc: i think i can safely push your version to master?
18:00:44 <Subfusc> if somone actually makes another GUI, that code can be written in the matter of minutes
18:00:50 <franciscod> of frontend atleast
18:00:58 * franciscod goes to check the other dirs
18:01:27 <franciscod> lame differences
18:01:27 <Subfusc> you can test that the files are working for you
18:01:37 <Subfusc> so we dont push something that is "broken" =P
18:01:55 <franciscod> Subfusc: working
18:02:08 <franciscod> splash, and on exit splash, empty white window, okay?
18:02:22 <franciscod> is there a git cp command?
18:02:25 <franciscod> or just a git mv?
18:02:37 <Subfusc> what are you going to do:?
18:02:59 <franciscod> mv stuff from your branch to mine,
18:03:01 <franciscod> push mine,
18:03:03 <franciscod> push master
18:03:34 <franciscod> cant be easier/simpler than that, can it
18:03:35 <franciscod> ?
18:03:58 <Subfusc> erhm, come again? are you taking my branch as it is, or are you doing changes first?
18:04:04 <franciscod> taking it as is
18:04:17 <franciscod> what changes do you propose? (if any) ?
18:04:29 <Subfusc> then i suggest pushing it to master, then you can just clone it and overwrite your own
18:04:43 <franciscod> gimme the commands darling :P
18:04:43 <Subfusc> using -f
18:04:47 <franciscod> yeah,
18:04:51 <franciscod> same thing
18:04:53 <Subfusc> i can pushe to master
18:04:58 <Subfusc> if you want
18:05:06 <franciscod> yeah, that would be quicker :P
18:05:08 <franciscod> go ahead
18:05:32 <Subfusc> i have to merge into main first thou
18:05:33 <Subfusc> wait
18:05:44 <franciscod> keep telling me what commands youre using
18:05:50 <franciscod> so i learn it too :P
18:05:58 <Subfusc> first i did git checkout master
18:06:04 <Subfusc> so i am in master branch
18:06:10 <Subfusc> then i did git merge subfusc
18:06:15 <Subfusc> taking my changes into master
18:06:21 * franciscod notes
18:06:43 * franciscod guesses git push -f <> is next
18:06:53 <Subfusc> now i have pushed to master
18:07:02 <franciscod> done?
18:07:11 <Subfusc> no, you have to use the -f option when you want to overwrite your own branch
18:07:18 <Subfusc> because you have incompatible updates ;)
18:07:22 <Subfusc> yes, finished
18:07:22 <Subfusc> :)
18:07:33 <franciscod> okay, now me clone  master
18:07:39 <franciscod> stop me when i say something wrong
18:07:40 <franciscod> :P
18:08:11 <Subfusc> yes, now you clone master
18:08:12 <Subfusc> :)
18:08:20 <franciscod> Subfusc: git clone ssh://ankursinha@fedorahosted.org/git/fedora-tour.git franciscod
18:08:23 <franciscod> correct?
18:08:37 <Subfusc> no
18:08:43 <Subfusc> to clone master you just
18:08:43 <franciscod> -b master?
18:08:51 <franciscod> or lose the dir name?
18:08:57 <Subfusc> loose the dir name
18:08:58 <Subfusc> ;)
18:09:03 <franciscod> bah :P
18:09:16 <franciscod> since i already have this stuff, cant i just rename your folder?
18:09:24 <franciscod> would save me the agony of downloading :P
18:09:39 * franciscod clones anyway
18:09:40 <Subfusc> well yes, but it wouldnt be named "master"
18:10:03 <Subfusc> its the difference of branching of master and branching of me (given they are the same at this point)
18:10:13 * franciscod is watching 713 shit again
18:10:21 <Subfusc> XD
18:10:33 * Subfusc gives franciscod a reasuring pat on the back
18:10:33 <franciscod> 5 min coffee break :P :P
18:10:44 <Subfusc> yeah, i think i have one cup left
18:10:46 <Subfusc> =D
18:10:57 <franciscod> heh, okay, me will ping when this is done
18:12:04 <Subfusc> kk
18:12:20 <Subfusc> then ill help you go through the steps of making a new branch
18:12:21 <Subfusc> :)
18:18:42 <franciscod> Subfusc: pingu ! done
18:18:49 <Subfusc> pongu!
18:19:00 <Subfusc> shall we branch and get you a fresh branch then?
18:19:11 <franciscod> you mean push it to my branch?
18:19:14 <Subfusc> wait, before we do this, code you have made
18:19:23 <Subfusc> (if you have made any) where is it?
18:19:31 <franciscod> you really wan2 know?
18:19:50 <franciscod> it died in the push screw up that i had done
18:19:56 <Subfusc> franciscod: i just want to make sure we dont lose any code you have made recently
18:20:12 <franciscod> i can write it in a day, not complex stuff, 2 files
18:20:21 <Subfusc> :)
18:20:36 <franciscod> so what now?
18:20:37 <Subfusc> btw, if you want an example of minidom, the TourObject.py files have minidom
18:20:44 <franciscod> okie,
18:20:46 * franciscod notes
18:21:02 <franciscod> git branch franciscod?
18:21:05 <Subfusc> yes
18:21:08 <Subfusc> that is correct
18:21:08 <Subfusc> =)
18:21:12 <franciscod> :X
18:21:25 <franciscod> git checkout franciscod
18:21:26 <franciscod> ?
18:21:27 <Subfusc> now to be sure do git branch
18:21:32 <Subfusc> and tell me what you see
18:21:39 <franciscod> it shows franciscod and master with * at master
18:21:42 <Subfusc> ok
18:21:49 <Subfusc> then we need to checkout franciscod
18:21:50 <Subfusc> :)
18:21:55 <franciscod> NICE :)
18:22:09 <franciscod> now * gone to franciscod
18:22:17 <Subfusc> then we do git push -f <ssh stuff>
18:22:24 <franciscod> now git push -f <ssh..> franciscod
18:22:28 <franciscod> no franciscod at end?
18:22:39 <Subfusc> the franciscod should be implied as you are in that branch
18:22:47 <Subfusc> but you can add it to be on the safe side if you want
18:22:58 <franciscod> ill add it, just to be sure,
18:22:58 <Subfusc> since you are using the -f option
18:22:59 <Subfusc> =P
18:23:02 <franciscod> exp later ;)
18:23:26 <franciscod> Subfusc: no commit?
18:23:30 <Subfusc> no
18:23:36 <Subfusc> shouldnt be necessary
18:23:54 <franciscod> Subfusc: when is commit necessary?
18:24:03 <Subfusc> when you have made changes
18:24:04 <Subfusc> :)
18:24:19 <franciscod> Subfusc: [Package@localhost fedora-tour]$ git push -f ssh://ankursinha@fedorahosted.org/git/fedora-tour.git franciscod
18:24:22 <franciscod> Total 0 (delta 0), reused 0 (delta 0)
18:24:23 <franciscod> thats it?
18:24:24 <franciscod> done?
18:24:26 <franciscod> To ssh://ankursinha@fedorahosted.org/git/fedora-tour.git + beb5216...b8794d4 franciscod -> franciscod (forced update)
18:24:32 <franciscod> dint even send anything :X
18:24:38 <Subfusc> that is correct
18:24:45 <Subfusc> i can doublecheck by cloning your branch
18:24:52 <franciscod> dint it have to upload stuff?
18:25:08 <Subfusc> no
18:25:11 <Subfusc> its allready there
18:25:12 <Subfusc> in master
18:25:13 <Subfusc> ;)
18:25:29 <franciscod> okay
18:25:37 <franciscod> timeline doesnt show my changeset :(
18:26:25 <Subfusc> gah
18:26:27 <Subfusc> i hate git
18:26:30 <franciscod> adint work?
18:26:33 <franciscod> ?
18:26:33 <franciscod> ?
18:26:46 <Subfusc> fatal: protocol error: bad line length character: Inva
18:26:48 <Subfusc> i get this error
18:26:54 <franciscod> :(
18:26:58 <Subfusc> its not form the repo, its something wrong with my command
18:28:32 <franciscod> Subfusc: diagnosed?
18:28:54 <Subfusc> something wrong with emacs termial
18:28:56 <Subfusc> presumbaly
18:29:06 <Subfusc> ls
18:29:10 <Subfusc> heh, wrong window
18:29:11 * franciscod thinks his thing failed
18:29:11 <Subfusc> =P
18:29:13 <franciscod> lol
18:29:23 <franciscod> i got a bad feeling about my push thing
18:29:34 <Subfusc> sin@main fedora-tour]$ cd frontend/
18:29:34 <Subfusc> [sin@main frontend]$ ls
18:29:35 <Subfusc> fedora-tour.conf  FedoraTour.py  MainWin.py  Skeleton.py  Utils.py
18:29:35 <Subfusc> FedoraTourGtk.py  __init__.py    Sample.py   Splash.py
18:29:35 <Subfusc> [sin@main frontend]$ cd ..
18:29:37 <Subfusc> [sin@main fedora-tour]$ git branch
18:29:39 <Subfusc> * franciscod
18:29:42 <Subfusc> works perfecly
18:30:29 <franciscod> so correct? :)
18:30:33 <Subfusc> yepp
18:30:40 <franciscod> Subfusc: a git pull merges with master, right?
18:30:50 <franciscod> how do i only update my branch, or your branch?
18:30:57 <franciscod> is there a command for that?
18:31:28 <Subfusc> if you are in a branch, and pull that  branch
18:31:31 <Subfusc> it will be updated
18:31:41 <Subfusc> if not, it will try to merge the two branches
18:32:08 <franciscod> so i just gotta be in the branch
18:32:14 <Subfusc> yepp
18:32:15 <franciscod> and pulling will only update it
18:32:20 <Subfusc> yepp
18:32:22 <franciscod> if im in master, it will try to merge
18:32:23 <franciscod> roger
18:32:29 <franciscod> okay, we got this done
18:32:46 <franciscod> i gotta rewrite my MenuObject and MainMenu things
18:33:02 <franciscod> #task franciscod rewrite MenuObject , MainMenu
18:33:08 <franciscod> Subfusc: anything else?
18:33:25 <Subfusc> franciscod: nope. I look forward to see the MenuObject code :)
18:33:32 <Subfusc> #endmeeting
18:33:35 <franciscod> #task rrix mail list regarding queries on branches etc
18:33:43 <franciscod> #task rrix create your branch
18:33:53 <Subfusc> hehe
18:34:00 <franciscod> endmeeting dint work?
18:34:06 <Subfusc> apparently not
18:34:07 <franciscod> duh..i dint give you chair.. soey
18:34:09 <Subfusc> ah, im not a chair
18:34:10 <Subfusc> =P
18:34:12 <franciscod> #endmeeting