MobileRead Forums - View Single Post - When do fixes/enhancements get added to source trunk?

Starson17 · 04-02-2010, 10:38 AM

Confusion has struck again. Normally, I upgrade Calibre shortly after a release. I download the binary and do a bazaar merge into my copy of the source.

I've done this for 20 versions or so and I've been under the impression that regardless of whether I run the binary, or the source I was running the same basic code. I assumed that there was another branch that Kovid maintains where incremental changes to the code are integrated, then the binary is built and the source for that binary is moved into the trunk that I get when I do a merge.

Today something happened in the 0.6.46 upgrade that makes me think that the bazaar merge brings in incremental changes added after the binary was built. It's possible I never saw this because I normally only merge just after the release of the binary. This time there was a longer delay

When running 0.6.46 binary, I do not see chaley's save search code. When running from source, I do. Part of the reason I'm confused is that I had planned to look at his code, and I had downloaded his bazaar patch file, but I could swear I didn't merge it in yet. Nonetheless, I see it when running from the source, but not when running from the binary.

This makes me think that the source has been incrementally updated to add his code after the binary was built.

Thus my question.

The related issue is that the save search code won't run:

Code:

ERROR: ERROR: Unhandled exception: <b>AttributeError</b>:'QString' object has no attribute 'decode'

Traceback (most recent call last):
  File "C:\Util\Calibre2\src\src\calibre\gui2\search_box.py", line 290, in save_search_button_clicked
  File "C:\Util\Calibre2\src\src\calibre\utils\search_query_parser.py", line 46, in add
  File "C:\Util\Calibre2\src\src\calibre\utils\search_query_parser.py", line 42, in force_unicode
AttributeError: 'QString' object has no attribute 'decode'

I just need to get my bearings as to what I should be seeing and what's coming in from the trunk source. The problem with this code not running could be interference with my code changes. I haven't brought in the unchanged source from the trunk (yet). Thanks for providing any light on this.

04-02-2010, 10:38 AM	#1
Starson17 Wizard Posts: 4,004 Karma: 177841 Join Date: Dec 2009 Device: WinMo: IPAQ; Android: HTC HD2, Archos 7o; Java:Gravity T	When do fixes/enhancements get added to source trunk? Confusion has struck again. Normally, I upgrade Calibre shortly after a release. I download the binary and do a bazaar merge into my copy of the source. I've done this for 20 versions or so and I've been under the impression that regardless of whether I run the binary, or the source I was running the same basic code. I assumed that there was another branch that Kovid maintains where incremental changes to the code are integrated, then the binary is built and the source for that binary is moved into the trunk that I get when I do a merge. Today something happened in the 0.6.46 upgrade that makes me think that the bazaar merge brings in incremental changes added after the binary was built. It's possible I never saw this because I normally only merge just after the release of the binary. This time there was a longer delay When running 0.6.46 binary, I do not see chaley's save search code. When running from source, I do. Part of the reason I'm confused is that I had planned to look at his code, and I had downloaded his bazaar patch file, but I could swear I didn't merge it in yet. Nonetheless, I see it when running from the source, but not when running from the binary. This makes me think that the source has been incrementally updated to add his code after the binary was built. Thus my question. The related issue is that the save search code won't run: Code: ERROR: ERROR: Unhandled exception: <b>AttributeError</b>:'QString' object has no attribute 'decode' Traceback (most recent call last): File "C:\Util\Calibre2\src\src\calibre\gui2\search_box.py", line 290, in save_search_button_clicked File "C:\Util\Calibre2\src\src\calibre\utils\search_query_parser.py", line 46, in add File "C:\Util\Calibre2\src\src\calibre\utils\search_query_parser.py", line 42, in force_unicode AttributeError: 'QString' object has no attribute 'decode' I just need to get my bearings as to what I should be seeing and what's coming in from the trunk source. The problem with this code not running could be interference with my code changes. I haven't brought in the unchanged source from the trunk (yet). Thanks for providing any light on this.