1 2014-07-27T05:54:53  *** sl33k_ has joined #moin-dev
   2 2014-07-27T07:17:32  *** xorAxAx has quit IRC
   3 2014-07-27T07:18:39  *** xorAxAx has joined #moin-dev
   4 2014-07-27T08:07:20  *** sl33k_ has quit IRC
   5 2014-07-27T08:15:15  *** sl33k_ has joined #moin-dev
   6 2014-07-27T09:17:24  *** sl33k_ has quit IRC
   7 2014-07-27T11:52:25  *** penguinRaider__ has joined #moin-dev
   8 2014-07-27T13:28:55  *** sl33k_ has joined #moin-dev
   9 2014-07-27T13:47:17  *** randomax has joined #moin-dev
  10 2014-07-27T14:31:03  *** skathpalia has joined #moin-dev
  11 2014-07-27T14:31:34  *** RogerHaase has joined #moin-dev
  12 2014-07-27T14:35:56  <skathpalia> RogerHaase, fixed https://bitbucket.org/saurabh_k/moin-2.0/issue/2/traceback-on-http-localhost-8081-admin
  13 2014-07-27T14:35:58  <skathpalia> cr https://codereview.appspot.com/120230043/
  14 2014-07-27T14:40:46  <RogerHaase> skathpalia: looks OK, commit
  15 2014-07-27T14:40:50  <skathpalia> Ok
  16 2014-07-27T14:42:48  <skathpalia> Also regarding the merge problem I was thinking of a solution as my css changes are not big (just a total change of 10 lines) so now I make a commit to revert the changes to css files and once randomax's patch is merged then I commit these css changes again
  17 2014-07-27T14:43:03  <skathpalia> RogerHaase, What do you say about this ^ idea?
  18 2014-07-27T14:45:33  <RogerHaase> did you try a test merge?
  19 2014-07-27T14:45:52  <skathpalia> Yeah randomax tried it
  20 2014-07-27T14:46:40  <skathpalia> It gives an option of having my changes or the new file
  21 2014-07-27T14:47:25  <RogerHaase> I also pulled randomax repo, then yours, am trying the reverse now just to see what it says
  22 2014-07-27T14:53:26  <RogerHaase> the messages are the same, regardless of which repo is pulled first
  23 2014-07-27T14:55:10  <RogerHaase> skathpalia: so your method makes sense to me.  That way your entire patch will be applied together.  Otherwise, your patch will be split
  24 2014-07-27T14:56:20  <skathpalia> so can I  commit to revert the css changes?
  25 2014-07-27T15:00:42  <skathpalia> RogerHaase, ^^
  26 2014-07-27T15:00:48  <RogerHaase> right, you reverse all of 8106a57943de including the change to ticket.html
  27 2014-07-27T15:01:09  <RogerHaase> must break for ~30 min
  28 2014-07-27T15:39:15  <RogerHaase> re
  29 2014-07-27T15:50:37  *** skathpalia has quit IRC
  30 2014-07-27T16:03:26  *** skathpalia has joined #moin-dev
  31 2014-07-27T17:15:55  <RogerHaase> randomax: your blog needs an update
  32 2014-07-27T17:18:15  *** skathpalia has quit IRC
  33 2014-07-27T17:28:36  <randomax> yeah i'll add a post
  34 2014-07-27T17:55:03  *** sl33k_ has quit IRC
  35 2014-07-27T18:10:32  *** sl33k_ has joined #moin-dev
  36 2014-07-27T18:21:51  *** magu_cic has joined #moin-dev
  37 2014-07-27T19:09:42  *** randomax has quit IRC
  38 2014-07-27T19:34:25  *** sl33k_ has quit IRC
  39 2014-07-27T19:58:11  *** waldi_ has joined #moin-dev
  40 2014-07-27T20:00:33  *** sharky93_ has joined #moin-dev
  41 2014-07-27T20:00:42  *** dreimark_ has joined #moin-dev
  42 2014-07-27T20:11:00  *** sharky93 has quit IRC
  43 2014-07-27T20:11:02  *** waldi has quit IRC
  44 2014-07-27T20:11:02  *** dreimark has quit IRC
  45 2014-07-27T21:52:20  *** RogerHaase has left #moin-dev
  46

MoinMoin: MoinMoinChat/Logs/moin-dev/2014-07-27 (last edited 2014-07-27 06:00:02 by IrcLogImporter)