MoinMoin: MoinMoinChat/Logs/moin-dev/2012-06-25

   1 2012-06-25T00:20:31  *** root has joined #moin-dev
   2 2012-06-25T00:20:55  *** root is now known as Guest22142
   3 2012-06-25T00:22:58  <Guest22142> I did a hg commit, hg push, hg merge, hg pull, hg resolve, hg resolve --all, in that order. I still dont have my changes uploaded to the main trunk. How can I fix this?
   4 2012-06-25T00:29:43  *** MattMaker has joined #moin-dev
   5 2012-06-25T00:33:24  <ThomasWaldmann> hi Guest22142
   6 2012-06-25T00:33:43  <ThomasWaldmann> is your question about moin development?
   7 2012-06-25T00:37:06  <Guest22142> Yes, have changed almost every rst file and want to upload my changes.
   8 2012-06-25T00:38:29  <ThomasWaldmann> well, if you want to contribute stuff, there are 2 usual ways
   9 2012-06-25T00:38:40  <ThomasWaldmann> either you publish them on your own bitbucket repo
  10 2012-06-25T00:38:57  <ThomasWaldmann> (so i can pull them from you)
  11 2012-06-25T00:39:11  <ThomasWaldmann> or you export a changeset and send it to me
  12 2012-06-25T00:39:57  <ThomasWaldmann> (and DVCS doesn't usually work like one can just upload to other peoples repository)
  13 2012-06-25T00:40:15  <ThomasWaldmann> did you fix typos / grammar?
  14 2012-06-25T00:41:02  *** MattMaker has quit IRC
  15 2012-06-25T00:43:31  *** MattMaker has joined #moin-dev
  16 2012-06-25T00:44:13  <Guest22142> Mostly typos and grammar. Not new functionality, since I havent had exposure to mm2 yet.
  17 2012-06-25T00:44:37  <Guest22142> How do I export a changeset?
  18 2012-06-25T00:45:34  <ThomasWaldmann> hg export REV
  19 2012-06-25T00:46:13  <Guest22142> Is REV a change number or is that the exact spelling of the command?
  20 2012-06-25T00:46:29  <ThomasWaldmann> REV is a revision hash
  21 2012-06-25T00:47:14  <ThomasWaldmann> like adacb649cad9
  22 2012-06-25T00:47:39  <ThomasWaldmann> (first look with hg log | less what rev you want to export)
  23 2012-06-25T00:48:21  <ThomasWaldmann> btw, thanks for helping. if you like you can change your irc nick with /nick yourname.
  24 2012-06-25T00:51:23  <ThomasWaldmann> btw, if you'ld like to know more about mercurial, there is a nice book there: http://hgbook.red-bean.com/
  25 2012-06-25T00:51:28  *** Guest22142 is now known as technossomy
  26 2012-06-25T00:52:33  <technossomy> Thanks, will revert with latest changes. Do I send it to your email address, Thomas? Should have it.
  27 2012-06-25T00:53:27  <ThomasWaldmann> tw-public@gmx.de
  28 2012-06-25T00:54:23  <ThomasWaldmann> (if you want to do that more easily in future, consider the bitbucket repo approach - it is also better for review)
  29 2012-06-25T00:58:44  *** dwcramer has quit IRC
  30 2012-06-25T01:20:03  *** technossomy has left #moin-dev
  31 2012-06-25T01:34:44  *** dwcramer has joined #moin-dev
  32 2012-06-25T01:35:22  *** spy has quit IRC
  33 2012-06-25T04:01:30  *** dwcramer has quit IRC
  34 2012-06-25T04:14:35  *** dwcramer has joined #moin-dev
  35 2012-06-25T05:13:10  *** dwcramer has quit IRC
  36 2012-06-25T09:29:57  <ThomasWaldmann> moin
  37 2012-06-25T09:38:51  * ThomasWaldmann reviews a huge docs diff from tech nossomy
  38 2012-06-25T10:54:11  <ThomasWaldmann> esyr: eSyr-ng: query (for esyr)
  39 2012-06-25T11:26:09  *** greg_f has joined #moin-dev
  40 2012-06-25T11:33:01  <dreimark> moin
  41 2012-06-25T12:32:25  <CIA-54> Tech Nossomy <technossomy@mail.com> default * 1402:356390d3f4a4 2.0/docs/ (21 files in 6 dirs): Syntactical changes to docs
  42 2012-06-25T12:32:27  <CIA-54> Thomas Waldmann <tw AT waldmann-edv DOT de> default * 1403:3bf3bc730b5d 2.0/ (364 files in 65 dirs): merged Tech Nossomy's doc fixes
  43 2012-06-25T12:32:27  <CIA-54> Thomas Waldmann <tw AT waldmann-edv DOT de> default * 1404:83d04b38b8fa 2.0/docs/ (6 files in 4 dirs): fixing some docs issues (syntax and semantics)
  44 2012-06-25T12:32:28  <CIA-54> Thomas Waldmann <tw AT waldmann-edv DOT de> default * 1405:0b947dbdffe8 2.0/docs/ (devel/development.rst user/markups.rst): docs: use rather contenttype instead of mimetype as this is the real metadata key
  45 2012-06-25T12:32:28  <CIA-54> Thomas Waldmann <tw AT waldmann-edv DOT de> default * 1406:aa79e8413d9c 2.0/docs/user/rest.rst: rst docs: fix/remove comment left there by a student working on it
  46 2012-06-25T13:14:47  *** spy has joined #moin-dev
  47 2012-06-25T14:06:18  *** dwcramer has joined #moin-dev
  48 2012-06-25T14:43:48  *** dwcramer has quit IRC
  49 2012-06-25T14:50:32  *** kanha_ has joined #moin-dev
  50 2012-06-25T14:51:10  *** kanha has quit IRC
  51 2012-06-25T15:05:22  *** dave_largo has joined #moin-dev
  52 2012-06-25T15:24:01  *** dwcramer has joined #moin-dev
  53 2012-06-25T15:43:35  *** brunomartin has joined #moin-dev
  54 2012-06-25T17:11:26  *** RogerHaase has joined #moin-dev
  55 2012-06-25T18:10:03  *** dave_largo has quit IRC
  56 2012-06-25T18:26:53  *** dave_largo has joined #moin-dev
  57 2012-06-25T18:45:11  *** greg_f has quit IRC
  58 2012-06-25T18:54:04  <RogerHaase> Are there docs on how to create ACLs in moin2?  I tried adding """content_acl = dict(before=u'', default=u'All:read', after=u'', hierarchic=False)""" to wikiconfig_editme.py
  59 2012-06-25T20:34:34  <ThomasWaldmann> and, didn't it work?
  60 2012-06-25T20:39:53  <RogerHaase> ThomasWaldmann:  no, a user who is not logged in can create pages
  61 2012-06-25T20:41:01  <ThomasWaldmann> can i see the full cfg?
  62 2012-06-25T20:47:26  <RogerHaase> http://dpaste.com/763348/
  63 2012-06-25T20:48:36  * ThomasWaldmann looks
  64 2012-06-25T20:49:16  <ThomasWaldmann> RogerHaase: you missed to copy some line(s) before and after this
  65 2012-06-25T20:49:32  <ThomasWaldmann> those are just kws, not settings
  66 2012-06-25T20:53:15  <RogerHaase> ThomasWaldmann: ah, got it, thanks!
  67 2012-06-25T20:57:50  *** dwcramer has quit IRC
  68 2012-06-25T22:01:43  *** dwcramer has joined #moin-dev
  69 2012-06-25T22:20:23  *** dwcramer has quit IRC
  70 2012-06-25T22:24:00  <dreimark> .oO em final on sunday
  71 2012-06-25T22:33:43  *** dwcramer has joined #moin-dev
  72 2012-06-25T23:22:59  *** dave_largo has quit IRC
  73 2012-06-25T23:38:17  *** sudo_dirk1 has joined #moin-dev
  74 2012-06-25T23:40:36  *** sudo_dirk has quit IRC
  75