1 2011-08-20T00:14:01 *** sinha1
2 2011-08-20T04:07:01 *** xorAxAx
3 2011-08-20T04:07:16 *** ronny
4 2011-08-20T04:07:48 *** ronny
5 2011-08-20T04:08:37 *** xorAxAx
6 2011-08-20T06:21:14 <Marchael> moin
7 2011-08-20T07:19:04 *** MattMaker
8 2011-08-20T08:10:42 <dreimark> moin
9 2011-08-20T09:12:25 *** raignarok
10 2011-08-20T09:19:05 *** franklin
11 2011-08-20T09:19:10 *** franklin
12 2011-08-20T09:28:14 *** raignarok
13 2011-08-20T11:15:32 <ThomasWaldmann> moin
14 2011-08-20T11:16:21 <ThomasWaldmann> Marchael: you did not finish what you were initially working on
15 2011-08-20T11:42:16 <dreimark> bbl
16 2011-08-20T12:35:22 <Marchael> ThomasWaldmann: do you mean tests? What should I add?
17 2011-08-20T12:35:43 <ThomasWaldmann> just read my review comments
18 2011-08-20T12:37:59 <Marchael> I read them, I added remove_index method to WhooshIndex() and remove old stuff in teardown method
19 2011-08-20T12:40:05 <ThomasWaldmann> you are calling methods on internal objects of ItemIndex
20 2011-08-20T12:40:55 <Marchael> is it bad?
21 2011-08-20T12:43:20 <Marchael> ThomasWaldmann: or I should use method of ItemIndex that calling method from internal object?
22 2011-08-20T12:43:30 <Marchael> to remove old stuff
23 2011-08-20T12:45:25 <ThomasWaldmann> (12:41) < Marchael> ThomasWaldmann: or I should use method of ItemIndex that calling method from internal object?
24 2011-08-20T12:45:29 <ThomasWaldmann> yes
25 2011-08-20T12:45:34 <Marchael> ok
26 2011-08-20T12:51:36 <Marchael> ThomasWaldmann: ps 7 http://codereview.appspot.com/4923042/
27 2011-08-20T13:05:02 <Marchael> gtg/bbl
28 2011-08-20T13:05:02 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> default * 449:dfa71b20022c 2.0/docs/admin/requirements.rst: requirements: add a note that pypy >= 1.6 works ok now
29 2011-08-20T13:05:21 *** Marchael
30 2011-08-20T13:10:51 *** Marchael
31 2011-08-20T13:11:14 <Marchael> ThomasWaldmann: sorry, I take some time before leave
32 2011-08-20T13:11:29 <Marchael> if it's not so hard, please review
33 2011-08-20T13:11:50 <ThomasWaldmann> review done
34 2011-08-20T13:17:28 <Marchael> ThomasWaldmann: please read reply
35 2011-08-20T13:20:48 * Marchael added another reply
36 2011-08-20T13:22:37 <ThomasWaldmann> if that kills an existing index there, yes
37 2011-08-20T13:23:24 <Marchael> ok
38 2011-08-20T13:23:32 <ThomasWaldmann> btw, one fundamental problem of your WhooshIndex class is that it opens the index in __init__
39 2011-08-20T13:24:01 <Marchael> then I need to add "create" param there
40 2011-08-20T13:24:07 <ThomasWaldmann> so if you want to have an instance of that class, you automatically have opened index files
41 2011-08-20T13:24:24 <ThomasWaldmann> which is bad if you just wanted to kill the index
42 2011-08-20T13:24:58 <Marchael> ok, then I'll add "create" there
43 2011-08-20T13:26:15 <Marchael> need to go, bbl
44 2011-08-20T13:30:11 *** Marchael
45 2011-08-20T14:39:39 <ThomasWaldmann> http://twitter.github.com/bootstrap looks nice. aside from the license, would we want to use that?
46 2011-08-20T14:40:19 <ThomasWaldmann> dreimark: ronny: waldi: xorAxAx: ^^
47 2011-08-20T14:46:04 <ThomasWaldmann> xorAxAx: https://bitbucket.org/pkumar/pytest_moin i just wanted to get a recent copy of pkumar's work and noticed that last change is 14d old!?
48 2011-08-20T14:47:34 <ronny> ThomasWaldmann: no idea about bootstrap, last time i had to do a website from scratch i used blueprint
49 2011-08-20T14:48:34 <ThomasWaldmann> url?
50 2011-08-20T14:48:55 <ThomasWaldmann> blueprintcss.org?
51 2011-08-20T14:51:00 *** raignarok
52 2011-08-20T15:14:25 *** raignarok
53 2011-08-20T15:14:28 *** raignarok_
54 2011-08-20T15:29:08 *** raignarok_
55 2011-08-20T15:29:30 *** raignarok
56 2011-08-20T15:29:48 *** raignarok_
57 2011-08-20T15:44:16 * ThomasWaldmann looks at sinha's stuff
58 2011-08-20T15:54:08 *** pkumar
59 2011-08-20T15:56:31 <pkumar> ThomasWaldmann : sorry for the delay, there were some uncertainties, so a bit delay in pushing into repo
60 2011-08-20T15:57:20 <CIA-114> pkumar <contactprashantat@gmail.com> * 7f2bb2c5a5ef r480 pytest2/MoinMoin/i18n/_tests/test_i18n.py: added test for i18n as test_i18n in i18n module
61 2011-08-20T15:57:20 <CIA-114> pkumar <contactprashantat@gmail.com> * 33475ee387b3 r481 pytest2/MoinMoin/auth/_tests/test_http.py: added test for auth.http as test_http in auth module
62 2011-08-20T15:57:20 <CIA-114> pkumar <contactprashantat@gmail.com> * cbc2976d018b r482 pytest2/MoinMoin/ (4 files in 3 dirs): get the items from xml in the test itself rather than in app.import_export_xml, removed import_export_xml from create_app_ext; tests become faster
63 2011-08-20T15:57:21 <CIA-114> pkumar <contactprashantat@gmail.com> * d2099fe6b0fe r483 pytest2/MoinMoin/auth/_tests/test_http.py: silly mistake in test_http corrected ; its teardown_method
64 2011-08-20T15:57:21 <CIA-114> pkumar <contactprashantat@gmail.com> * 845467217500 r484 pytest2/MoinMoin/auth/_tests/test_auth.py: addedtest for auth.__init__ as test_auth in auth module
65 2011-08-20T15:57:27 <CIA-114> pkumar <contactprashantat@gmail.com> * ed5424a32527 r485 pytest2/MoinMoin/conftest.py: removed try, finally from MoinTestFunction in conftest
66 2011-08-20T15:57:27 <CIA-114> pkumar <contactprashantat@gmail.com> * 228142d0fca2 r486 pytest2/MoinMoin/auth/_tests/test_auth.py: test_auth.test_handle_login changed for better testing, added test for auth.get_multistage_continuation_url in test_auth
67 2011-08-20T15:57:27 <CIA-114> pkumar <contactprashantat@gmail.com> * f420130cebc8 r487 pytest2/MoinMoin/ (2 files in 2 dirs): test cleanup; deteted due to fresh clone
68 2011-08-20T15:57:27 <CIA-114> pkumar <contactprashantat@gmail.com> * 561b5ef3b46e r488 pytest2/MoinMoin/auth/_tests/test_log.py: added test for auth.log as test_log in auth module
69 2011-08-20T15:57:27 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * a50ded41a60d r489 pytest2/setup.py: as long as xstatic api doesn't change in an incompatible way, we can just have minimum requirements for the packages
70 2011-08-20T15:57:29 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * e8bd41ab7bdd r490 pytest2/MoinMoin/ (9 files in 7 dirs): (log message trimmed)
71 2011-08-20T15:57:29 <CIA-114> AccessControlList: do not require cfg object
72 2011-08-20T15:57:29 <CIA-114> Giving the cfg to the ACL object caused some issues (for example, the AclTokenizer
73 2011-08-20T15:57:30 <CIA-114> in the whoosh branch needed cfg and was part of the schema. whoosh tries to
74 2011-08-20T15:57:30 <CIA-114> pickle the schema and that did not work for cfg).
75 2011-08-20T15:57:30 <CIA-114> Refactored "auth_trusted" - this is now a user object attribute, so the ACL
76 2011-08-20T15:57:30 <CIA-114> code does not need to know the list of trusted auth methods (which is still in
77 2011-08-20T15:57:31 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 7ed1945aeb03 r491 pytest2/ (setup.py MoinMoin/items/__init__.py): merged main
78 2011-08-20T15:57:31 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 3a4d2982006f r492 pytest2/MoinMoin/storage/ (8 files in 3 dirs):
79 2011-08-20T15:57:33 <CIA-114> storage Revisions (NewRevision as well as StoredRevision) now support read/seek/tell
80 2011-08-20T15:57:35 <CIA-114> added test for read / seek / tell (for NewRevision as well as for StoredRevision)
81 2011-08-20T15:57:35 <CIA-114> sqlalchemy backend is a bit broken still, added a comment there.
82 2011-08-20T15:57:35 <CIA-114> fileserver and flatfile backends: added missing tell()
83 2011-08-20T15:57:48 <CIA-114> fix bug with copy empty indexes.
84 2011-08-20T15:57:48 <CIA-114> TODO: whoosh searcher can't find items moving to trash, so it continuely try to add trashed revisions to index.
85 2011-08-20T15:57:48 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * cbf97d9067f3 r556 pytest2/ (33 files in 15 dirs): Merging with main repo
86 2011-08-20T15:57:51 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * ae63dc7cf921 r557 pytest2/setup.py: Update whoosh to 1.8.4
87 2011-08-20T15:57:51 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 5d06ad313f7d r558 pytest2/MoinMoin/ (4 files in 4 dirs): WhooshIndex object creation at start up, implemented some functions for working with indexes
88 2011-08-20T15:57:51 <CIA-114> (29 lines omitted)
89 2011-08-20T15:57:52 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * ea001bcb5f90 r603 pytest2/MoinMoin/ (script/maint/index.py storage/backends/indexing.py):
90 2011-08-20T15:57:52 <CIA-114> Fixed issue with runtime indexation https://bitbucket.org/marchael/moin-2.0/issue/9/content-entered-via-wiki-ui-is-not-indexed
91 2011-08-20T15:57:52 <CIA-114> Fixes issue with content indexing in building\updating script
92 2011-08-20T15:57:53 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 0f9a97f74a8d r613 pytest2/MoinMoin/storage/backends/indexing.py: Fixed https://bitbucket.org/marchael/moin-2.0/issue/3/dicts-are-bad-for-sorting Fixes #3.
93 2011-08-20T15:57:56 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * a2aee9baecd3 r638 pytest2/whoosh200-highlight-mode-fix.patch: removed whoosh-highlighting patch due issue was fixed in 2.1.0
94 2011-08-20T15:57:56 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * c9653e23e167 r578 pytest2/ (3 files in 3 dirs): Fixed runtime and offline indexation, if interwiki was None, moin crashed
95 2011-08-20T15:57:57 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * f5dd44e2f1fe r581 pytest2/ (6 files in 4 dirs):
96 2011-08-20T15:57:57 <CIA-114> - Update whoosh to 2.0
97 2011-08-20T15:57:57 <CIA-114> - Search result template
98 2011-08-20T15:57:57 <CIA-114> - Search in headings
99 2011-08-20T15:57:57 <CIA-114> - Show search statistics
100 2011-08-20T15:57:57 <CIA-114> - Highlighting headings of found documents
101 2011-08-20T15:57:58 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 6f6a29825a1e r614 pytest2/MoinMoin/ (3 files in 3 dirs): Fixed test_sourcecode failures
102 2011-08-20T15:57:59 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 65c2c01aa266 r600 pytest2/MoinMoin/ (search/revision_converter.py storage/backends/indexing.py): Fixing issue with double content indexing, cosmetic changes in debug output
103 2011-08-20T15:58:02 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 0ab852761ff2 r597 pytest2/MoinMoin/apps/frontend/views.py: Using Multifield parser for searching in revisions name and content
104 2011-08-20T15:58:02 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * c5cc63fd82f6 r588 pytest2/ (4 files in 4 dirs):
105 2011-08-20T15:58:02 <CIA-114> Content indexing support
106 2011-08-20T15:58:02 <CIA-114> - backend_to_index() moved to MoinMoin.search.revision_converter and can be used from other places
107 2011-08-20T15:58:14 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 66981eb25822 r635 pytest2/MoinMoin/ (3 files in 2 dirs): Added searching in non-current revisions Fixes #18.
108 2011-08-20T15:58:16 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 0b400626bc93 r627 pytest2/MoinMoin/search/revision_converter.py: rev converter: misc src cosmetics
109 2011-08-20T15:58:17 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 0173477e11bc r615 pytest2/MoinMoin/search/analyzers.py: Update docstring
110 2011-08-20T15:58:18 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 6d1f88659ab1 r639 pytest2/MoinMoin/ (4 files in 3 dirs): Add dynamic fields support(may be don't work for last revs after rebuilding)
111 2011-08-20T15:58:19 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 91b72ea6039e r625 pytest2/MoinMoin/search/indexing.py: indexing: misc src cosmetics
112 2011-08-20T15:58:20 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * fdd1b2dec689 r602 pytest2/MoinMoin/ (3 files in 3 dirs): Improved index --for ... --action show output, syntax change in css class name
113 2011-08-20T15:58:22 <CIA-114> pkumar <contactprashantat@gmail.com> * 742bdd77031b r651 pytest2/MoinMoin/storage/_tests/ (test_backends_router.py test_backends.py): removed the smileys temporarily as it slows the tests a lot until 'this' whoosh bug is fixed
114 2011-08-20T15:58:23 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 215d7a8f5b3e r604 pytest2/MoinMoin/ (3 files in 3 dirs):
115 2011-08-20T15:58:23 <CIA-114> Fixes #6.
116 2011-08-20T15:58:24 <CIA-114> Fixing https://bitbucket.org/marchael/moin-2.0/issue/6/unpretty-search-results-rendering
117 2011-08-20T15:58:24 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 7a5557f9355f r644 pytest2/MoinMoin/ (4 files in 3 dirs): merge
118 2011-08-20T15:58:25 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 2dc35ebbc43a r608 pytest2/MoinMoin/util/kvstore.py: removed MoinMoin.util.kvstore - not used any more
119 2011-08-20T15:58:26 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * e362e7abfda6 r621 pytest2/MoinMoin/search/ (analyzers.py _tests/test_indexing.py): merged whoosh repo
120 2011-08-20T15:58:28 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 8589afef0e6c r628 pytest2/MoinMoin/storage/backends/indexing.py: indexing storage mixin: misc src cosmetics
121 2011-08-20T15:58:29 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 598b1731069b r612 pytest2/MoinMoin/ (config/default.py app.py storage/backends/indexing.py): remove cfg.index_rebuild and related code (not needed any more)
122 2011-08-20T15:58:29 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 293e27b399b7 r594 pytest2/MoinMoin/ (3 files in 3 dirs): Showing highlighted results on search results page
123 2011-08-20T15:58:29 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 5c6ef2031235 r572 pytest2/MoinMoin/ (5 files in 3 dirs): Update dosctrings for MoinMoin.search, add (c) in MoinMoin.storage.backends.indexing
124 2011-08-20T15:58:30 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * d49d08bb5f50 r620 pytest2/MoinMoin/ (3 files in 3 dirs): merged whoosh repo
125 2011-08-20T15:58:30 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 2340dd0ee580 r643 pytest2/MoinMoin/ (4 files in 3 dirs):
126 2011-08-20T15:58:30 <CIA-114> move backend_to_index function to MoinMoin.search.indexing module
127 2011-08-20T15:58:31 <CIA-114> as the schema is defined there, it makes sense that the conversion function
128 2011-08-20T15:58:31 <CIA-114> is also there.
129 2011-08-20T15:58:31 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * e57259c40f74 r598 pytest2/MoinMoin/themes/modernized/static/css/common.css: Using white backgroung for long search form
130 2011-08-20T15:58:34 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * a9b78e0231c6 r601 pytest2/MoinMoin/ (templates/search_results.html apps/frontend/views.py): Remove small search field at top right on search result template
131 2011-08-20T15:58:34 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * a64b59e52616 r624 pytest2/MoinMoin/search/indexing.py: reduce duplication in indexing schemas
132 2011-08-20T15:58:34 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 6b4f5e5850a3 r647 pytest2/MoinMoin/storage/backends/indexing.py: fixed issue with destroying items. Revisions don't deleted from all revisions index Fixes #33.
133 2011-08-20T15:58:34 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 348f20628eb8 r629 pytest2/MoinMoin/search/_tests/test_analyzers.py: Fixed acl analyzer test Fixes #21.
134 2011-08-20T15:58:34 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 643dd888e74a r631 pytest2/MoinMoin/templates/search_results.html: Fixed showing results for wikis sharing one index
135 2011-08-20T15:58:40 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * b8ebdf2c816e r646 pytest2/docs/ (admin/index.rst index.rst): Updated admin docs
136 2011-08-20T15:58:40 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 6c407c842f4c r616 pytest2/MoinMoin/search/_tests/test_indexing.py: Updated query string for acl tokenizer
137 2011-08-20T15:58:40 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * b54d70026e30 r591 pytest2/MoinMoin/ (9 files in 4 dirs): merged
138 2011-08-20T15:58:40 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 951c8edf9776 r607 pytest2/MoinMoin/storage/backends/indexing.py:
139 2011-08-20T15:58:41 <CIA-114> remove ItemIndex.history (was replaced by history_whoosh)
140 2011-08-20T15:58:41 <CIA-114> remove all kvstore usage (was intended to store user-defined metadata,
141 2011-08-20T15:58:42 <CIA-114> but we'll use whoosh dynamic fields for that soon)
142 2011-08-20T15:58:42 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 2e8c562f7524 r622 pytest2/MoinMoin/storage/backends/indexing.py: indexing: clarify ItemIndex.update_item/remove_item, remove wrong code
143 2011-08-20T15:58:46 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 33249607fd48 r641 pytest2/MoinMoin/script/maint/index.py: Refactoing crap in building script Fixes #32.
144 2011-08-20T15:58:46 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 0f29cbb71223 r648 pytest2/MoinMoin/search/indexing.py: Using scoring name and name_exact fields to improve search results Fixes #30.
145 2011-08-20T15:58:46 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * ea543ad2fb6c r586 pytest2/MoinMoin/ (3 files in 2 dirs): temporarily remove acl fields from the schema due to pickle issues
146 2011-08-20T15:58:46 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 6800ab9dd159 r634 pytest2/MoinMoin/templates/search_results.html: fixed acl search issue Fixes #14
147 2011-08-20T15:58:58 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 748523da8db6 r577 pytest2/MoinMoin/ (26 files in 3 dirs): Merged
148 2011-08-20T15:58:58 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 05657b355ce4 r590 pytest2/MoinMoin/search/ (_tests/test_analyzers.py analyzers.py indexing.py): Fix ACL indexing issue for preloaded items with acl field (thanks brunomartin and Thomas Waldmann)
149 2011-08-20T15:58:58 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 430223bb9701 r571 pytest2/whoosh184-fix.patch: Add missing ^M in whoosh patch
150 2011-08-20T15:58:59 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 1691f2cb863d r592 pytest2/MoinMoin/ (4 files in 2 dirs): merged
151 2011-08-20T15:58:59 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 6119699cec2f r626 pytest2/MoinMoin/search/analyzers.py: analyzers: misc src cosmetics
152 2011-08-20T15:59:18 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 3c1d17e77d1c r599 pytest2/MoinMoin/storage/backends/indexing.py: Return removed line for converting backend revision to whoosh index
153 2011-08-20T15:59:18 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * fd28cf720d2c r574 pytest2/wikiconfig.py: Added index_dir_tmp and wiki_name to default config
154 2011-08-20T15:59:18 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * f720cf1e8969 r584 pytest2/setup.py: fixing multiple heads
155 2011-08-20T15:59:18 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 256c6e0ae8bf r609 pytest2/MoinMoin/storage/backends/indexing.py: removed all_tags / tagged_items, replaced by *_whoosh
156 2011-08-20T15:59:18 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 72278e056ec4 r610 pytest2/MoinMoin/storage/backends/indexing.py: indexing: removed/commented unused code
157 2011-08-20T15:59:19 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 5d805b9f5e91 r637 pytest2/setup.py: Require whoosh version not lesser than 2.1.0 Fixes #18.
158 2011-08-20T16:00:18 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 8b39c8a2140e r587 pytest2/setup.py: return whoosh back
159 2011-08-20T16:00:18 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * fb400cd3391f r582 pytest2/MoinMoin/ (3 files in 3 dirs): Add long search input field on search results page, remove highlighing search results due bugs, some fixes in css
160 2011-08-20T16:00:18 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 2305be335d83 r589 pytest2/MoinMoin/ (9 files in 7 dirs): merged
161 2011-08-20T16:00:18 <CIA-114> Michael Mayorov <marchael@kb.csu.ru> * 0fd6527bd6aa r585 pytest2/ (3 files in 3 dirs): merged
162 2011-08-20T16:00:18 <CIA-114> Thomas Waldmann <tw AT waldmann-edv DOT de> * 8cc72401fc25 r611 pytest2/ (9 files in 6 dirs): (log message trimmed)
163 2011-08-20T16:00:18 <CIA-114> indexing: remove sqlalchemy based indexing code (is done by whoosh now)
164 2011-08-20T16:00:19 <CIA-114> rename some methods from *_whoosh to * (as there are no others any more,
165 2011-08-20T16:00:20 <CIA-114> all indexing is based on whoosh now).
166 2011-08-20T16:01:19 <CIA-114> added some "XXX wrong" comments to indexing, where item and revision level
167 2011-08-20T16:01:19 <CIA-114> was confused.
168 2011-08-20T16:01:19 <CIA-114> (10 lines omitted)
169 2011-08-20T16:22:10 <ThomasWaldmann> pkumar: i am not sure which uncertainties you mean that kept you back from pushing for 2 weeks
170 2011-08-20T16:22:32 <ThomasWaldmann> and also from not updating your diary daily
171 2011-08-20T16:26:19 <pkumar> ThomasWaldmann : well, about repository: the cleanup function was a little fuzzy as it was there initially, thanks to whoosh and marchael, it works in a better way now, also, last whole week looking into the changes in the test results due to latest changes in whoosh. I just wanted to push once every thing gets clear.
172 2011-08-20T16:27:26 <pkumar> regarding diary, I'll update it today itself, sorry for the delay
173 2011-08-20T17:01:24 * ThomasWaldmann clones pkumar's repo
174 2011-08-20T17:02:52 <pkumar> ThomasWaldmann : please temme if it works correctly or I need to add/modify some thing there?
175 2011-08-20T17:08:45 <ThomasWaldmann> how do i run all tests?
176 2011-08-20T17:10:09 <pkumar> ThomasWaldmann : if you already have run ./quickinstall, as it needs pytest, from the repo dir just use py.test
177 2011-08-20T17:10:58 <ThomasWaldmann> ah. i thought it was "pytest" (that does nothing).
178 2011-08-20T17:10:58 <pkumar> ThomasWaldmann : please run update tip as it has two branches
179 2011-08-20T17:11:12 <pkumar> yeah, thats different from py.test
180 2011-08-20T17:12:24 <pkumar> ThomasWaldmann : please paste the test result so that I can verify it with mine results
181 2011-08-20T17:13:37 <ThomasWaldmann> pkumar: can you please get rid of that useless branch and just merge it into default branch?
182 2011-08-20T17:14:02 <pkumar> which one? the pytest branch?
183 2011-08-20T17:14:41 <pkumar> all my works are in pytest2 branch as suggested by ronny initially
184 2011-08-20T17:15:18 <pkumar> ThomasWaldmann : ^
185 2011-08-20T17:16:02 <pkumar> ThomasWaldmann : I'm really curious how the test ran?
186 2011-08-20T17:16:24 <ThomasWaldmann> i am still setting up your stuff after doing a wrong first attempt
187 2011-08-20T17:16:41 <pkumar> ok,
188 2011-08-20T17:20:19 <ThomasWaldmann> why is it still pulling mathjax? that was already removed in main repo.
189 2011-08-20T17:21:05 <pkumar> ThomasWaldmann : woops, seems like a meging mistake from me. I'll correct it
190 2011-08-20T17:32:24 <ThomasWaldmann> http://paste.pocoo.org/show/461331/ << pkumar
191 2011-08-20T17:34:02 <ThomasWaldmann> pkumar: i remember we talked about line 405 and i advised you what to do. why is it still broken?
192 2011-08-20T17:36:03 <pkumar> ThomasWaldmann : looking..
193 2011-08-20T17:39:21 <pkumar> ThomasWaldmann : I'm sorry, I'm very forgetful, can you please tell me again I need to modify there?
194 2011-08-20T17:40:11 <pkumar> ThomasWaldmann : you are talking about test__base.py right?
195 2011-08-20T17:42:02 <ThomasWaldmann> the traceback is pretty clear
196 2011-08-20T17:43:04 <ThomasWaldmann> and if you look at the source, the solution is pretty clear also, just look at similar code some lines above
197 2011-08-20T17:44:28 <pkumar> ThomasWaldmann : ah, now I remember exactly. It's not content_block but context_block.
198 2011-08-20T17:44:37 <pkumar> thanks
199 2011-08-20T17:45:44 <ThomasWaldmann> fix it, commit, push
200 2011-08-20T17:46:28 <ThomasWaldmann> after that, how about 913. we talked about this recently. did you file a whoosh bug?
201 2011-08-20T17:49:54 <pkumar> ThomasWaldmann : no I didn't file it. I was thinking it to mark as xfail for now with a comment mentioning the whoosh bug.
202 2011-08-20T17:50:11 <pkumar> ThomasWaldmann : I'l file the bg now itself
203 2011-08-20T17:50:16 <pkumar> bug*
204 2011-08-20T17:51:43 <CIA-114> pkumar <contactprashantat@gmail.com> * c9aa22139870 r655 pytest2/setup.py: removed mathjax from setup, was there due to merging mistake
205 2011-08-20T17:51:43 <CIA-114> pkumar <contactprashantat@gmail.com> * 0538a280d1bb r656 pytest2/MoinMoin/macro/_base.py: content_block changed to context_block in macro._base to remove the test failure
206 2011-08-20T18:01:42 <pkumar> ThomasWaldmann : well, if I remember correctly, tests in router and middleware_acl fails mostly due to execution of create_item in indexing. it publishes a metadata. so we have an item even without a revision and resulting of some tests gailures
207 2011-08-20T18:03:47 *** raignarok
208 2011-08-20T18:11:07 <ThomasWaldmann> yes, storage is messy yet
209 2011-08-20T18:11:56 <ThomasWaldmann> pkumar: i notice a big difference in number of tests
210 2011-08-20T18:12:07 <ThomasWaldmann> == 59 failed, 2119 passed, 234 skipped, 1 xfailed, 4 error in 444.93 seconds ===
211 2011-08-20T18:12:12 <ThomasWaldmann> main repo
212 2011-08-20T18:12:26 <ThomasWaldmann> ======= 32 failed, 1181 passed, 22 skipped, 1 xfailed in 160.06 seconds ========
213 2011-08-20T18:12:42 <ThomasWaldmann> your repo
214 2011-08-20T18:12:58 <pkumar> ThomasWaldmann: yeah, there are few differences:
215 2011-08-20T18:13:56 <pkumar> 1. The tests failures in storage which were in old repo are fixed here(in fs2 and a few form here and there)
216 2011-08-20T18:15:25 <pkumar> 2. tests with yield methods are iterated and tested inside conftest itself,
217 2011-08-20T18:16:06 <ThomasWaldmann> ok, so 1 generative old test that yielded 50 tests is only counted as one now?
218 2011-08-20T18:17:16 <pkumar> 3. Also, just cloning the main repo and running it using pytest2 with few basic changes gives different result. I think this is the way tests are handled in py.test1 and py.test2
219 2011-08-20T18:20:11 <ThomasWaldmann> i just do that. :)
220 2011-08-20T18:20:51 <ThomasWaldmann> ok, do you have any open todo that should be done before merging it into main?
221 2011-08-20T18:22:34 <pkumar> hmm, lemme check in ep.
222 2011-08-20T18:23:43 <pkumar> ThomasWaldmann : no, I don't think so anything at present except writing docs which were supposed to be there till mid term till that time of the work.
223 2011-08-20T18:25:00 <pkumar> nothin in coding part it seems as if now
224 2011-08-20T18:28:53 <ThomasWaldmann> xorAxAx: ronny: anything todo afayk?
225 2011-08-20T18:43:30 <ThomasWaldmann> pkumar: test_ldap_login?
226 2011-08-20T18:47:42 <pkumar> ThomasWaldmann : what's with that?
227 2011-08-20T18:47:56 <pkumar> it skips it seems here
228 2011-08-20T18:48:19 <ThomasWaldmann> it doesn't appear in test output header
229 2011-08-20T18:50:54 <ThomasWaldmann> and it still imports py.test
230 2011-08-20T18:51:52 <pkumar> ThomasWaldmann : does it something to do with http://pytest.org/latest/changelog.html
231 2011-08-20T18:52:17 <pkumar> under Changes between 2.0.2 and 2.0.3
232 2011-08-20T18:52:24 <pkumar> sppeds up skips
233 2011-08-20T18:52:30 <pkumar> speeds*
234 2011-08-20T18:52:44 <pkumar> I'm not sure though
235 2011-08-20T18:52:50 <ThomasWaldmann> it does not appear at all
236 2011-08-20T18:53:07 <ThomasWaldmann> also, when searching for py.test, i find lots of places with that string
237 2011-08-20T18:53:17 <ThomasWaldmann> shouldn't that be pytest now?
238 2011-08-20T18:55:04 <pkumar> yeah, that should have been, but some of the modules were assigned to hardy89 and I changed py.test > pytest whichever I encountered on the way of working for his modules
239 2011-08-20T18:55:36 <ThomasWaldmann> ok, so that means the project as a whole is incomplete
240 2011-08-20T18:58:12 <ThomasWaldmann> and that means, we can't merge it as a bigger count of tests is simply missing, because noone worked on it
241 2011-08-20T18:59:38 <pkumar> ThomasWaldmann : I'm sorry but what is missing?
242 2011-08-20T18:59:59 <ThomasWaldmann> just search for files containing py.test
243 2011-08-20T19:00:26 <pkumar> and? replace it with pytest?
244 2011-08-20T19:00:44 <pkumar> right?
245 2011-08-20T19:01:02 <ThomasWaldmann> i don't know, i assume so. but you should know. :)
246 2011-08-20T19:01:17 <pkumar> yeah :)
247 2011-08-20T19:01:53 <pkumar> ThomasWaldmann : did you run the tests with basic changes with pytest2?
248 2011-08-20T19:02:22 <ThomasWaldmann> i don't understand the question
249 2011-08-20T19:03:41 <pkumar> never mind. I was just asking if you wanna confirm about test counts b running tests with few basic changes enough to be compatible wit pytest2
250 2011-08-20T19:05:21 <ThomasWaldmann> pkumar: please create documentation that describes this
251 2011-08-20T19:05:35 <ThomasWaldmann> or point me to existing docs
252 2011-08-20T19:06:37 <pkumar> ok, sure. I'll mention this in the docs. the docs are not ready yet. will be soon
253 2011-08-20T19:09:03 <pkumar> ThomasWaldmann : I had mentioned the result of test runs in one of my diary pages from initial execution but I don't remember the date
254 2011-08-20T19:10:53 <pkumar> np I'll do it again
255 2011-08-20T19:11:31 <pkumar> brb
256 2011-08-20T19:20:27 <ThomasWaldmann> dreimark: it somehow looks like some of my changes in main repo are not in sinha's repo
257 2011-08-20T19:37:38 *** sinha
258 2011-08-20T19:38:11 <ThomasWaldmann> sinha: see issue tracker
259 2011-08-20T19:38:16 <sinha> yes
260 2011-08-20T19:39:39 <ThomasWaldmann> maybe before trying to fix that, find out which of your merges were bad ones
261 2011-08-20T19:41:01 <sinha> ThomasWaldmann: actually, when i was merging marchael changes (2 days ago), there were conflicts coming and suddenly pc got shutdown, when i restarted it, then i was seeing conflicted merges
262 2011-08-20T19:41:29 <sinha> i was having the feeling of something unwanted happen that time
263 2011-08-20T19:41:34 <sinha> can i do a revert now ?
264 2011-08-20T19:42:21 <ThomasWaldmann> first find out when (which changeset) there were unclean merges
265 2011-08-20T19:42:36 <ThomasWaldmann> maybe it was not just the last merge
266 2011-08-20T19:43:31 <ThomasWaldmann> in general, when merging branches, one has to be very careful. some stuff will get merged automatically (but one still should verify it), some changes will need careful manual merging.
267 2011-08-20T19:44:09 <sinha> ThomasWaldmann: this was the last merge https://bitbucket.org/sinha/moin2/changeset/0268070335d1
268 2011-08-20T19:48:06 <ThomasWaldmann> i know what the last merge was
269 2011-08-20T19:56:10 *** raignarok
270 2011-08-20T19:57:36 <CIA-114> pkumar <contactprashantat@gmail.com> * 04cc08c8e31c r657 pytest2/MoinMoin/ (12 files in 4 dirs): changed py.test to pytest in all the modules
271 2011-08-20T19:59:14 <pkumar> ThomasWaldmann : about test_ldap_login, that skip at the first line is responsible. I tried removing it a and I get the test in the execution list
272 2011-08-20T19:59:46 <pkumar> a failure though due to not having ldap
273 2011-08-20T19:59:55 <pkumar> import error
274 2011-08-20T20:01:58 <pkumar> ThomasWaldmann : so the project seems complete now :)
275 2011-08-20T20:03:13 <pkumar> though an irony, there is always a room for improvement, nothing is complete
276 2011-08-20T20:03:24 <pkumar> :)
277 2011-08-20T20:04:38 <ThomasWaldmann> pkumar: if it skips, does it list "S" now?
278 2011-08-20T20:05:01 <ThomasWaldmann> (because it did not list it at all)
279 2011-08-20T20:05:53 <pkumar> no, it doesn't. It'll show S only if we skip the function inside a calss or a function individually as such.
280 2011-08-20T20:06:32 <ThomasWaldmann> sinha: before working on any "fix", please discuss here
281 2011-08-20T20:07:13 <pkumar> in pytest2 skipping at the very begging of a test function/class do not shows the test in the list
282 2011-08-20T20:07:14 <sinha> ThomasWaldmann: actually i am working on a small fix, did some changes yesterday and left with some now
283 2011-08-20T20:07:26 <pkumar> ThomasWaldmann : ^
284 2011-08-20T20:07:37 <sinha> it was separating select all checkbox from Actions bar
285 2011-08-20T20:07:56 <ThomasWaldmann> pkumar: hmm, strange
286 2011-08-20T20:08:33 <ThomasWaldmann> sinha: if you are continuing with a bad repo, you need to expect to reapply your changes to a fixed repo
287 2011-08-20T20:09:09 <pkumar> ThomasWaldmann : anything need to be done at this point for the project?
288 2011-08-20T20:09:39 <ThomasWaldmann> well, you and your mentor should know better than me
289 2011-08-20T20:09:52 <pkumar> xorAxAx : hi
290 2011-08-20T20:10:08 <pkumar> so, what's your opinion?
291 2011-08-20T20:10:20 <ThomasWaldmann> maybe just do a diff between main repo and your repo to see all the changes done. review them. use grep or something to check if changes were complete.
292 2011-08-20T20:19:49 <ThomasWaldmann> sinha: it looks like you did not merge any files with conflicts, but just continued using your versions
293 2011-08-20T20:20:16 <pkumar> xorAxAx : only the documentation part is remaining, they are under progress
294 2011-08-20T20:20:19 <sinha> okay
295 2011-08-20T20:20:34 <sinha> ThomasWaldmann: so what should i do now ?
296 2011-08-20T20:20:54 <ThomasWaldmann> the main question now is "did you always do it like that"?
297 2011-08-20T20:21:22 <xorAxAx> pkumar: at the beginning of the function!?
298 2011-08-20T20:23:19 <pkumar> xorAxAx : yeah, if I run a test with the skip for a function specifically, it shows 's' for that function
299 2011-08-20T20:24:04 <xorAxAx> yes, but you wrote something else
300 2011-08-20T20:25:32 <pkumar> oh, my bad. I meant to say in the beginning of the file as in test_ldap_login
301 2011-08-20T20:25:45 <birkenfeld> xorAxAx: come on, be nice
302 2011-08-20T20:25:56 <sinha> ThomasWaldmann: no, earlier i used to do "hg merge" and hardly 1-2 times a conflict appeared and they opens up in vim, and i saves them up
303 2011-08-20T20:26:03 *** raignarok
304 2011-08-20T20:26:42 <xorAxAx> pkumar: hmm, weird, sounds like a bug, can you move the skip into a setup function?
305 2011-08-20T20:26:54 *** raignarok
306 2011-08-20T20:27:06 <pkumar> lemme try that
307 2011-08-20T20:27:26 <ThomasWaldmann> sinha: ok, if you are sure, then you just need to hg clone -r the_revision_before_the_bad_merge badrepo goodrepo
308 2011-08-20T20:27:52 <ThomasWaldmann> then do the merge again and be very careful this time. if you have questions, ask.
309 2011-08-20T20:28:04 <pkumar> xorAxAx : there are more than 1 classes here and the whole test is based on ldap
310 2011-08-20T20:28:07 <sinha> ThomasWaldmann: yes what do i do when conflicts appear
311 2011-08-20T20:28:08 *** raignarok
312 2011-08-20T20:28:20 <sinha> i mean as i said lots of vim window opens up
313 2011-08-20T20:28:23 <ThomasWaldmann> you need to manually export / reapply all changesets from badrepo afterwards then in goodrepo
314 2011-08-20T20:28:28 <pkumar> the test is skipped if ldap is not there
315 2011-08-20T20:28:42 <xorAxAx> pkumar: you can have module level setup functions
316 2011-08-20T20:28:42 <ThomasWaldmann> sinha: you resolve them :)
317 2011-08-20T20:28:52 <ThomasWaldmann> deeply thinking about what's correct
318 2011-08-20T20:29:10 <sinha> resolve mean how ? whats the action there ? saves the right one or something else
319 2011-08-20T20:29:34 <pkumar> xorAxAx : hmm, ok with the same name and alguments?
320 2011-08-20T20:29:50 <xorAxAx> pkumar: see the docs
321 2011-08-20T20:29:51 <ThomasWaldmann> procedure depends on your merge tool, i use the stuff that puts conflict markers in the source and do everything manually
322 2011-08-20T20:30:09 <pkumar> my battery is dying so may get disconnected any moment
323 2011-08-20T20:30:31 <sinha> ThomasWaldmann: can i merge afterwards applying all my changes (now i clone first, do the rest of changes, then merge) ?
324 2011-08-20T20:30:46 <xorAxAx> pkumar: do you have internet via gprs?
325 2011-08-20T20:31:03 <pkumar> xorAxAx : yeah, sorta that
326 2011-08-20T20:31:27 <pkumar> xorAxAx : why?
327 2011-08-20T20:31:48 <xorAxAx> pkumar: just curious :)
328 2011-08-20T20:32:05 <pkumar> xorAxAx : k :)
329 2011-08-20T20:32:14 <xorAxAx> dont forget to use ssh compression when pulling/pushing to save bytes
330 2011-08-20T20:32:17 <ThomasWaldmann> sinha: if you want do save your workdir changes, just use hg diff >savethem.diff
331 2011-08-20T20:32:55 <pkumar> xorAxAx : I was unaware of that yet, will use from now on
332 2011-08-20T20:32:57 <ThomasWaldmann> sinha: and later patch -p1 <savethem.diff from work directory
333 2011-08-20T20:33:20 <sinha> ThomasWaldmann: okay and i can copy the changeset which i have done after creating this "bad repo"
334 2011-08-20T20:33:30 <sinha> those are in bitbucket
335 2011-08-20T20:34:22 <ThomasWaldmann> in your local repo, you can do hg export to save the changeset. hg import or patch to apply them in the good repo
336 2011-08-20T20:34:27 <pkumar> xorAxAx : except the test_ldap_login any improvement achievable at this period of time
337 2011-08-20T20:34:31 <pkumar> ?
338 2011-08-20T20:34:58 <sinha> ThomasWaldmann: okay, trying them now
339 2011-08-20T20:35:06 <xorAxAx> pkumar: what do you mean?
340 2011-08-20T20:35:17 <xorAxAx> pkumar: things you could do?
341 2011-08-20T20:35:25 <pkumar> xorAxAx : yeah
342 2011-08-20T20:35:36 <pkumar> at this small span of time
343 2011-08-20T20:35:42 <ThomasWaldmann> pkumar: all i found out was just be reviewing your changes. you can do that yourself also :)
344 2011-08-20T20:36:21 <ThomasWaldmann> and i just compared a test run in main repo with a test run in your repo
345 2011-08-20T20:37:33 <xorAxAx> pkumar: is the test coverage good?
346 2011-08-20T20:37:48 <pkumar> xorAxAx : far better than before
347 2011-08-20T20:38:02 <xorAxAx> you could try to even improve it
348 2011-08-20T20:38:10 <xorAxAx> i will review your code next week when i am back at home
349 2011-08-20T20:38:23 <ThomasWaldmann> and having the stuff in a mergable state is much more important than coverage, btw
350 2011-08-20T20:39:11 <pkumar> xorAxAx : I'm supposed to work on the project till 22nd right.
351 2011-08-20T20:39:18 <pkumar> though I would really like to get this work ahead
352 2011-08-20T20:39:31 <pkumar> even after project ends
353 2011-08-20T20:39:46 <ThomasWaldmann> read the timeline and you have to be available until end of soc
354 2011-08-20T20:39:56 <xorAxAx> indeed
355 2011-08-20T20:40:06 <xorAxAx> pkumar: ^
356 2011-08-20T20:40:10 <pkumar> ThomasWaldmann : yeah, I would surely be
357 2011-08-20T20:40:13 <pkumar> :)
358 2011-08-20T20:41:02 <pkumar> ThomasWaldmann : I was just talking about pencil down date
359 2011-08-20T20:41:20 <xorAxAx> pkumar: so i will supply suggested changes to yourchangesets :)
360 2011-08-20T20:41:29 <xorAxAx> s/changes/change hints/
361 2011-08-20T20:41:34 <ThomasWaldmann> pencils down means the end of stuff that counts for soc.
362 2011-08-20T20:42:12 <pkumar> k,
363 2011-08-20T20:42:13 <ThomasWaldmann> it doesn't mean that you are not allowed to contribute any more (but the contrary).
364 2011-08-20T20:42:50 <pkumar> xorAxAx : ok, thanks
365 2011-08-20T20:43:19 <pkumar> ThomasWaldmann : ok,
366 2011-08-20T20:47:54 <ronny> ThomasWaldmann: atm im out of sync again, tommorow is my zurich trip
367 2011-08-20T20:48:08 *** pkumar
368 2011-08-20T21:24:10 <ThomasWaldmann> pytest-cov - py.test plugin for coverage reporting with support
369 2011-08-20T21:24:36 <ThomasWaldmann> pytest-pep8 - pytest plugin to check source code against PEP8
370 2011-08-20T21:24:53 <ThomasWaldmann> pytest-codecheckers - pytest plugin to add source code sanity checks (pep8
371 2011-08-20T21:26:09 <ThomasWaldmann> did someone look at these ^^?
372 2011-08-20T21:41:11 <sinha> ThomasWaldmann: now that i have created a new clean repo, do i push it to same bitbucket repo or a new one ?
373 2011-08-20T21:41:41 <ThomasWaldmann> what does "new clean repo" mean exactly?
374 2011-08-20T21:47:57 <sinha> ThomasWaldmann: i mean as you said to do a clone of the old one upto the last unconflicted revision
375 2011-08-20T21:48:06 <sinha> and i did the same
376 2011-08-20T21:48:37 <ThomasWaldmann> ok, now pull/merge from main repo
377 2011-08-20T21:49:13 <ThomasWaldmann> and this time, resolve the conflicts carefully
378 2011-08-20T21:51:02 <sinha> ThomasWaldmann: after doing hg merge, it opens 3-4 vim windows, so which one to save ? (i can see each of them having different changes)
379 2011-08-20T21:54:05 <ThomasWaldmann> i don't use that for merging
380 2011-08-20T21:56:11 <sinha> then what ?
381 2011-08-20T21:56:15 <sinha> any specific tool ?
382 2011-08-20T21:56:53 <ThomasWaldmann> http://vimdoc.sourceforge.net/htmldoc/diff.html maybe it is this what you have
383 2011-08-20T21:57:20 <ThomasWaldmann> as i already said, i don't use a merging tool. i let mercurial put conflict markers into the source file and resolve manually.
384 2011-08-20T22:08:49 <ThomasWaldmann> sinha: http://moinmo.in/MoinDev/MercurialGuide maybe that helps for some of your issues
385 2011-08-20T22:11:06 *** MattMaker
386 2011-08-20T23:16:28 *** MattMaker_
387 2011-08-20T23:16:40 *** MattMaker
388 2011-08-20T23:16:41 *** MattMaker_
389 2011-08-20T23:31:33 <dreimark> re
390 2011-08-20T23:31:41 <dreimark> sinha: i use kdiff3
391 2011-08-20T23:33:50 <dreimark> ThomasWaldmann: i look at that bootstrap, currently packing and then sleeping a little bit
392 2011-08-20T23:34:22 <sinha> dreimark: but when i do hg merge, it automatically opens the vim windows
393 2011-08-20T23:34:31 <sinha> is this something default ?
394 2011-08-20T23:35:09 <sinha> and if i closes the window, then "conflicted merge" message appears
395 2011-08-20T23:42:57 <dreimark> http://mercurial.selenic.com/wiki/MergeToolConfiguration
396 2011-08-20T23:44:50 <dreimark> sinha: you need to look at the incoming changes and make it work again with yours. It should not just a copy from yours over the new one
397 2011-08-20T23:45:30 <dreimark> because then the main changes are gone
398 2011-08-20T23:46:21 <dreimark> so it is sometimes not only a decision which version to use.
