1 2015-02-14T00:18:01 *** vipul20
2 2015-02-14T04:06:18 *** vipul20
3 2015-02-14T06:43:30 *** pjoshi_
4 2015-02-14T06:43:37 <pjoshi_> ThomasWaldmann: Moin
5 2015-02-14T06:44:03 <pjoshi_> I have committed one wrong file and now in every pull request that commit is appending
6 2015-02-14T06:44:10 <pjoshi_> What to do ?
7 2015-02-14T07:49:22 <ronny> pjoshi_: ping>
8 2015-02-14T07:49:34 <pjoshi_> pong
9 2015-02-14T07:50:02 <pjoshi_> ronny:
10 2015-02-14T07:50:03 <ronny> pjoshi_: i suppose you based all other commits on that one wrong commit>
11 2015-02-14T07:51:01 <pjoshi_> ronny: Yeah, I made an wrong commit as I have version issues that time so an addition normalized.css file have been created
12 2015-02-14T07:51:17 <pjoshi_> and now in every pull request it has been including
13 2015-02-14T07:52:12 <ronny> the normal way to ix that would be to use the evolve extension and purge, but since bitbucket is a pain, you need to do it in another way
14 2015-02-14T07:52:33 <ronny> pjoshi_: how many changesets do you currently have in flight?
15 2015-02-14T07:52:42 <ronny> (as in based on the bad one)
16 2015-02-14T07:53:27 <pjoshi_> 2 as in there are two worng files that are being including
17 2015-02-14T07:54:20 <ronny> hmm, can you enable the histedit extension?
18 2015-02-14T07:54:44 <ronny> the basic flow would be to histedit, delete the 2 offending changes, then push to a *new* repo on bitbucket
19 2015-02-14T07:54:54 <ronny> (oh, and in between force the draft phase)
20 2015-02-14T07:55:34 <ronny> sorry im goin a bit fast, please ask fr details, im without coffee today and not entirely usefull to beginners with these tools until my coffee delivery arrives
21 2015-02-14T07:56:37 <pjoshi_> ah.. thats great
22 2015-02-14T07:56:40 <pjoshi_> but yeah
23 2015-02-14T07:56:54 <pjoshi_> Most of the things bounces off my head
24 2015-02-14T07:56:55 <pjoshi_> :P
25 2015-02-14T07:57:16 <ronny> hmm
26 2015-02-14T07:57:46 <pjoshi_> So is it good to again fork the repo from the main ?
27 2015-02-14T07:57:51 <ronny> yes
28 2015-02-14T07:58:08 <pjoshi_> Okay that time I can do that
29 2015-02-14T07:58:20 <ronny> i suppose the easiest way right now is to fork and redo/transplat the good commits
30 2015-02-14T07:58:58 <pjoshi_> but what if I have contributed a lot or changes a lot of correct things and then these kind of wrong commits are done ?
31 2015-02-14T07:59:05 <pjoshi_> (just for knowledge )
32 2015-02-14T07:59:54 <ronny> if the wrong commits are the latest ones, one can just strip them
33 2015-02-14T08:00:04 <ronny> or roll back
34 2015-02-14T08:00:38 <ronny> the mercurial community is working on smething where you can just purge the bad commits - no matter where they are, unfortunately its another 6 onths till its included
35 2015-02-14T08:00:40 <pjoshi_> okay so instead of deleting the repo and forking again
36 2015-02-14T08:00:47 <pjoshi_> I can rollback this time aslo
37 2015-02-14T08:00:49 <pjoshi_> *also
38 2015-02-14T08:01:20 <ronny> pjoshi_: rollback can only do the last action (which usually is a commit))
39 2015-02-14T08:01:35 <ronny> to take off more than one commit, you need to use strip
40 2015-02-14T08:01:39 <pjoshi_> Ah.. yeah that's what I want to confirm
41 2015-02-14T08:01:51 <pjoshi_> And strip ?
42 2015-02-14T08:02:00 <pjoshi_> Never heard before
43 2015-02-14T08:02:09 <pjoshi_> I should try that
44 2015-02-14T08:02:33 <ronny> its disavled by default, you hand it a revision, and it makes a backup, then removes the revision and its children from the history
45 2015-02-14T08:03:26 <pjoshi_> ronny: oh.. i see
46 2015-02-14T08:03:52 <pjoshi_> Okay so this time let me fork it again and will create a pull request afterwards
47 2015-02-14T08:05:44 <pjoshi_> and ronny One more thing
48 2015-02-14T08:06:04 <ronny> pjoshi_: its a bit unfortunate - in about 6 months the worflow is "hg purge $BADREV && hg evolve -a"
49 2015-02-14T08:07:57 <pjoshi_> You know why automatically that normalized.css file has been created in the project when I just run ./m css
50 2015-02-14T08:08:20 <pjoshi_> ronny: Didn't get your last msg
51 2015-02-14T08:08:55 <ronny> pjoshi_: mercurial will grow new commands for editing recent history - they will bcome part of it in the next 6 months
52 2015-02-14T08:09:20 <pjoshi_> Ah.. Okay yeah
53 2015-02-14T08:09:48 <pjoshi_> I prefer github as it is more user friendly then bitbucket
54 2015-02-14T08:10:19 <ronny> well, bitbucket got brought up by a cooperation that then betraied the original goals of the thing
55 2015-02-14T08:11:44 <pjoshi_> oh.. what were the original goals btw
56 2015-02-14T08:12:19 <ronny> to be an awesome mercurial code hoster
57 2015-02-14T08:12:43 <pjoshi_> Hahaha.. yeah they really failed in that
58 2015-02-14T08:13:11 <ronny> i was with it since the beginning bascially - back then when you reported an issue the main dev would ping you about half an hour later on irc to try the fix
59 2015-02-14T08:18:21 <pjoshi_> oh great
60 2015-02-14T08:18:36 <pjoshi_> You are with Moin since when ?
61 2015-02-14T08:27:16 *** pjoshi_
62 2015-02-14T08:32:51 *** pjoshi_
63 2015-02-14T08:33:12 <pjoshi_> ronny: Sorry that college internet sucks
64 2015-02-14T08:33:13 <pjoshi_> :/
65 2015-02-14T08:41:30 <ronny> pjoshi_: i joined in on a C3 a few years back, but these days im mostly inactive
66 2015-02-14T08:42:09 <pjoshi_> yeah Never seen you previously when I worked on moin
67 2015-02-14T08:42:23 <pjoshi_> But really nice to talk to you :)
68 2015-02-14T08:44:31 <ronny> enjoy
69 2015-02-14T10:32:46 *** pjoshi_
70 2015-02-14T10:33:51 *** aabs08
71 2015-02-14T10:36:19 *** pjoshi_
72 2015-02-14T11:13:20 <aabs08> ThomasWaldmann, codereview issue #483 and #482 https://codereview.appspot.com/194330043/
73 2015-02-14T11:37:19 *** aabs08
74 2015-02-14T12:02:10 *** abhi234
75 2015-02-14T12:03:35 <abhi234> Hi! I'd like to contribute to MoinMoin development. Can anyone help me get started
76 2015-02-14T12:07:05 <waldi> start with https://moinmo.in/WeNeedHelp, read https://moinmo.in/MoinMoin2.0, maybe fix something in https://moinmo.in/MoinMoin2.0
77 2015-02-14T12:07:11 <waldi> err, https://bitbucket.org/thomaswaldmann/moin-2.0/issues
78 2015-02-14T12:07:56 *** aabs08
79 2015-02-14T12:19:46 *** pjoshi_
80 2015-02-14T12:20:14 *** pjoshi_
81 2015-02-14T12:45:02 *** abhi234
82 2015-02-14T12:50:54 *** aabs08
83 2015-02-14T13:06:25 *** greg_f
84 2015-02-14T13:17:29 *** abhi234
85 2015-02-14T14:02:10 *** abhi234
86 2015-02-14T14:20:46 *** pjoshi_
87 2015-02-14T14:21:16 *** pjoshi_
88 2015-02-14T15:31:29 *** pjoshi_
89 2015-02-14T16:28:49 <ThomasWaldmann> ronny: query
90 2015-02-14T17:23:59 <ronny> ThomasWaldmann: ping?
91 2015-02-14T17:28:48 *** yask007
92 2015-02-14T17:30:14 *** aabs08
93 2015-02-14T17:34:32 <aabs08> ThomasWaldmann, codereview issue #483 and #482 https://codereview.appspot.com/194330043/
94 2015-02-14T18:18:24 *** aabs08
95 2015-02-14T18:55:33 <ThomasWaldmann> ronny: https://moinmo.in/Sprint2015
96 2015-02-14T18:56:02 <ThomasWaldmann> ananasova: eSyr-ng: ReimarBauer: waldi: ^^
97 2015-02-14T18:56:03 *** aabs08
98 2015-02-14T19:04:14 <aabs08> ThomasWaldmann, codereview issue #483 and #482 https://codereview.appspot.com/194330043/
99 2015-02-14T19:07:48 *** RogerHaase
100 2015-02-14T19:12:28 *** greg_f
101 2015-02-14T19:13:00 <aabs08> RogerHaase, I would like to work on issue #481 after my login issue is resolved
102 2015-02-14T19:13:01 <ThomasWaldmann> RogerHaase: https://moinmo.in/Sprint2015
103 2015-02-14T19:13:39 <ThomasWaldmann> (a long way for you, but you could maybe virtually attend)
104 2015-02-14T19:13:54 <RogerHaase> haha
105 2015-02-14T19:17:51 <ThomasWaldmann> like hangout / mumble / irc :)
106 2015-02-14T19:26:03 <RogerHaase> aabs08: ok by me, I do not think anyone is working on 481
107 2015-02-14T19:26:45 <aabs08> RogerHaase, I wanted to ask for issue #481 whether i need to use something like @presenter('meta', add_trail=True) or I can use flaskg.user.add_trail(item_name) in the function
108 2015-02-14T19:27:21 <RogerHaase> dk
109 2015-02-14T19:30:26 <aabs08> ThomasWaldmann, do you have any idea regarding the same using @presenter('meta', add_trail=True) or simply flaskg.user.add_trail(item_name) for adding a page trail?
110 2015-02-14T19:55:02 *** aabs08
111 2015-02-14T20:04:36 *** yask007
112 2015-02-14T20:16:40 *** aabs08
113 2015-02-14T20:21:25 *** aabs08
114 2015-02-14T20:37:02 *** aabs08
115 2015-02-14T21:39:32 *** aabs08
116 2015-02-14T21:39:54 <RogerHaase> ThomasWaldmann: fix #492 pep8 version 1.6.1 breaks 11 tests https://codereview.appspot.com/204930043/
117 2015-02-14T22:05:04 *** RogerHaase
118 2015-02-14T22:29:42 *** maskinen322
119 2015-02-14T22:49:23 *** maskinen322
120
