MoinMoin: MoinMoinChat/Logs/moin-dev/2013-10-09

   1 2013-10-09T01:17:28  *** sudo_dirk_ has joined #moin-dev
   2 2013-10-09T01:18:29  *** sudo_dirk has quit IRC
   3 2013-10-09T03:10:00  *** eSyr-ng has quit IRC
   4 2013-10-09T03:10:50  *** waldi has quit IRC
   5 2013-10-09T03:11:40  *** ThomasWaldmann has quit IRC
   6 2013-10-09T03:11:58  *** eSyr-ng has joined #moin-dev
   7 2013-10-09T03:12:00  *** waldi has joined #moin-dev
   8 2013-10-09T03:12:02  *** waldi has joined #moin-dev
   9 2013-10-09T03:12:02  *** ThomasWaldmann has joined #moin-dev
  10 2013-10-09T03:12:02  *** ThomasWaldmann has joined #moin-dev
  11 2013-10-09T03:15:19  *** moinBot has joined #moin-dev
  12 2013-10-09T03:17:24  *** eSyr-ng_ has joined #moin-dev
  13 2013-10-09T03:17:25  *** not-xjjk has joined #moin-dev
  14 2013-10-09T03:22:33  *** eSyr-ng has quit IRC
  15 2013-10-09T03:22:35  *** moinBot` has quit IRC
  16 2013-10-09T03:22:35  *** xjjk has quit IRC
  17 2013-10-09T06:12:57  *** xorRaxRax has joined #moin-dev
  18 2013-10-09T06:12:58  *** xorAxAx has quit IRC
  19 2013-10-09T06:15:25  *** xiaq has quit IRC
  20 2013-10-09T06:28:06  *** xiaq has joined #moin-dev
  21 2013-10-09T06:28:30  *** xiaq is now known as Guest6854
  22 2013-10-09T08:27:38  *** xorRaxRax is now known as xorAxAx
  23 2013-10-09T09:19:58  *** Guest6854 is now known as xiaq
  24 2013-10-09T09:22:54  *** greg_f has joined #moin-dev
  25 2013-10-09T14:23:00  *** RogerHaase has joined #moin-dev
  26 2013-10-09T16:22:00  <sharky93> moin
  27 2013-10-09T16:22:22  <TheSheep> sharky93: hey
  28 2013-10-09T16:23:54  <sharky93> TheSheep: hi!
  29 2013-10-09T16:29:43  <sharky93> TheSheep: i was about to upload the code samples which google wants us to do, should i add changesets from both of my repos?
  30 2013-10-09T16:33:19  <TheSheep> you should merge them first
  31 2013-10-09T16:34:29  <sharky93> TheSheep: we're currently having univ. exams, and i think we have the deadline tomorrow.. merging would take some time i think
  32 2013-10-09T16:34:44  <TheSheep> why, are there conflicts?
  33 2013-10-09T16:35:26  <TheSheep> also, didn't you have several weeks for it?
  34 2013-10-09T16:36:09  <sharky93> conflicts would be mainly because of moving the JS files around
  35 2013-10-09T16:36:55  <sharky93> we had made a separate fork for the bootstrap changes
  36 2013-10-09T16:37:09  <sharky93> i.e fork from the main moin repo
  37 2013-10-09T16:39:46  <sharky93> TheSheep: i think submitting the changesets from the bootstrap fork should be fine, no?
  38 2013-10-09T16:40:31  <TheSheep> I don't think so
  39 2013-10-09T16:41:45  <sharky93> TheSheep: umm, majority of the changes are from that itself, why not then?
  40 2013-10-09T16:42:28  <TheSheep> because you weren't paid for making majority of changes, but for making all of them
  41 2013-10-09T16:44:22  <sharky93> hmm true, but then merging them is separate right?
  42 2013-10-09T16:44:57  <sharky93> we can surely treat it in the way that any code to be merged will mostly result in a conflict which will have to be resolved
  43 2013-10-09T16:45:32  <TheSheep> why are you trying to convince me? I'm not the one who is going to decide, and I think the rules are pretty obvious
  44 2013-10-09T16:45:58  * sharky93 confused
  45 2013-10-09T16:46:19  <TheSheep> the whole purpose of the google summer of code is to land new stuff in the project -- if you don't merge it, it cannot be included in MoinMoin
  46 2013-10-09T16:46:45  <TheSheep> sharky93: I submited my evaluation, that's where my role ends
  47 2013-10-09T16:47:14  <TheSheep> sharky93: I will help you with technical problems, of course
  48 2013-10-09T16:48:41  <sharky93> TheSheep: true, i was not trying to convince, just making sure anything i do is not wrong .. why google needs the code is a whole different aspect, and i'll be obviously more than happy to help resolve the merge conflicts! :)
  49 2013-10-09T17:02:13  *** johill has left #moin-dev
  50 2013-10-09T17:56:09  *** greg_f has quit IRC
  51 2013-10-09T20:03:59  *** RogerHaase has left #moin-dev
  52 2013-10-09T22:16:05  *** brunomartin has quit IRC
  53