PS to comment #12. Here you can see fragment of log file (version 2.4b5)) with error which appear then internal diff utility open text with CP1251 at the left side and mac-cyrillic at the right, then fragment of the log file then external diff csdiff is opening. Also you can see hex codes of characters in the program fragment with russian where incorrect encoding with the internal diff occurred, and oroginal text of program where problem with cp1251 encoding with internal diff occurred. The screenshot attached. You can see that mac-cyrillic has no errors with this text, but cp1251 can not decode it and fallback to latin1. Also you can see again that external diff utility work well for the same text.
==================================================
Fri 2011-07-22 10:27:39 +0300
0.172 bazaar version: 2.4b5
0.172 bzr arguments: [u'qdiff']
0.219 looking for plugins in C:/Users/Slava/AppData/Roaming/bazaar/2.0/plugins
0.234 looking for plugins in C:/Program Files/Bazaar/plugins
0.343 encoding stdout as osutils.get_user_encoding() 'cp1251'
0.867 opening working tree 'C:/Users/Slava/Documents/CATI/MyTests/10067_test'
[20940] 2011-07-22 10:27:40.213 INFO: Failed to decode using charmap, falling back to latin1
[20940] 2011-07-22 10:27:40.213 INFO: Failed to decode using charmap, falling back to latin1
[20940] 2011-07-22 10:28:11.740 INFO: Failed to decode using charmap, falling back to latin1
Fri 2011-07-22 10:30:07 +0300
0.093 bazaar version: 2.4b5
0.093 bzr arguments: [u'qsubprocess', u'--bencode', u'l4:diff7:--using52:C:\\Program Files\\ComponentSoftware\\CSDiff\\CSDiff.exee']
0.124 looking for plugins in C:/Users/Slava/AppData/Roaming/bazaar/2.0/plugins
0.140 looking for plugins in C:/Program Files/Bazaar/plugins
0.265 encoding stdout as osutils.get_user_encoding() 'cp1251'
0.421 bazaar version: 2.4b5
0.421 bzr arguments: [u'diff', u'--using', u'C:\\Program Files\\ComponentSoftware\\CSDiff\\CSDiff.exe']
0.421 encoding stdout as osutils.get_user_encoding() 'cp1251'
0.483 opening working tree 'C:/Users/Slava/Documents/CATI/MyTests/10067_test'
===========Here the hex values of fragment there differences is=====================
0000000000: 4C 61 6E 67 75 61 67 65 20 71 73 6C 3B 09 09 0D
0000000010: 0A 64 61 74 61 6E 61 6D 65 20 4D 6F 62 69 6C 65
0000000020: 3B 09 09 09 3C 20 20 31 35 2E 30 38 2E 32 30 30
0000000030: 38 20 20 3E 0D 0A 0D 0A 3C 20 CF F0 EE E2 E5 F0
0000000040: EA E0 20 E5 F9 E5 20 F0 E0 E7 20 2D 20 F7 F2 EE
0000000050: E1 FB 20 EF EE F1 EC EE F2 F0 E5 F2 FC 20 EA E0
0000000060: EA 20 EF EE EA E0 E7 FB E2 E0 E5 F2 20 EE F2 EB
0000000070: E8 F7 E8 FF 20 EF F0 E8 20 EF EE EB F3 F7 E5 ED
0000000080: E8 E8 20 E8 E7 EC E5 ED E5 ED E8 E9 20 F1 20 EE
0000000090: F7 ED EE E2 ED EE E9 20 E2 E5 F2 EA E8 20 3E 0D
00000000A0: 0A 3C 20 C0 20 F2 E5 EF E5 F0 FC 20 E2 ED EE F1
00000000B0: E8 EC 20 E8 E7 EC E5 ED E5 ED E8 FF 20 E2 20 E4
00000000C0: EE EF EE EB ED E8 F2 E5 EB FC ED EE E9 20 E8 20
00000000D0: F1 EC EE F2 F0 E8 EC 20 EA E0 EA 20 EF E5 F0 E5
00000000E0: E4 E0 FE F2 F1 FF 20 E2 20 EE F1 ED EE E2 ED F3
00000000F0: FE 20 3E 0D 0A 0D 0A 3C 20 2D 2D 2D 2D 2D 2D 2D
==========Here the txt fragment where differences is==================
Language qsl;
dataname Mobile; < 15.08.2008 >
< Проверка еще раз - чтобы посмотреть как показывает отличия при получении изменений с очновной ветки >
< А теперь вносим изменения в дополнительной и смотрим как передаются в основную >
PS to comment #12. Here you can see fragment of log file (version 2.4b5)) with error which appear then internal diff utility open text with CP1251 at the left side and mac-cyrillic at the right, then fragment of the log file then external diff csdiff is opening. Also you can see hex codes of characters in the program fragment with russian where incorrect encoding with the internal diff occurred, and oroginal text of program where problem with cp1251 encoding with internal diff occurred. The screenshot attached. You can see that mac-cyrillic has no errors with this text, but cp1251 can not decode it and fallback to latin1. Also you can see again that external diff utility work well for the same text. ======= ======= ======= ======= ======= ======= = Slava/AppData/ Roaming/ bazaar/ 2.0/plugins plugins get_user_ encoding( ) 'cp1251' Slava/Documents /CATI/MyTests/ 10067_test'
=======
Fri 2011-07-22 10:27:39 +0300
0.172 bazaar version: 2.4b5
0.172 bzr arguments: [u'qdiff']
0.219 looking for plugins in C:/Users/
0.234 looking for plugins in C:/Program Files/Bazaar/
0.343 encoding stdout as osutils.
0.867 opening working tree 'C:/Users/
[20940] 2011-07-22 10:27:40.213 INFO: Failed to decode using charmap, falling back to latin1
[20940] 2011-07-22 10:27:40.213 INFO: Failed to decode using charmap, falling back to latin1
[20940] 2011-07-22 10:28:11.740 INFO: Failed to decode using charmap, falling back to latin1
Fri 2011-07-22 10:30:07 +0300 --using52: C:\\Program Files\\ ComponentSoftwa re\\CSDiff\ \CSDiff. exee'] Slava/AppData/ Roaming/ bazaar/ 2.0/plugins plugins get_user_ encoding( ) 'cp1251' ComponentSoftwa re\\CSDiff\ \CSDiff. exe'] get_user_ encoding( ) 'cp1251' Slava/Documents /CATI/MyTests/ 10067_test'
0.093 bazaar version: 2.4b5
0.093 bzr arguments: [u'qsubprocess', u'--bencode', u'l4:diff7:
0.124 looking for plugins in C:/Users/
0.140 looking for plugins in C:/Program Files/Bazaar/
0.265 encoding stdout as osutils.
0.421 bazaar version: 2.4b5
0.421 bzr arguments: [u'diff', u'--using', u'C:\\Program Files\\
0.421 encoding stdout as osutils.
0.483 opening working tree 'C:/Users/
===========Here the hex values of fragment there differences is===== ======= ======= ==
0000000000: 4C 61 6E 67 75 61 67 65 20 71 73 6C 3B 09 09 0D
0000000010: 0A 64 61 74 61 6E 61 6D 65 20 4D 6F 62 69 6C 65
0000000020: 3B 09 09 09 3C 20 20 31 35 2E 30 38 2E 32 30 30
0000000030: 38 20 20 3E 0D 0A 0D 0A 3C 20 CF F0 EE E2 E5 F0
0000000040: EA E0 20 E5 F9 E5 20 F0 E0 E7 20 2D 20 F7 F2 EE
0000000050: E1 FB 20 EF EE F1 EC EE F2 F0 E5 F2 FC 20 EA E0
0000000060: EA 20 EF EE EA E0 E7 FB E2 E0 E5 F2 20 EE F2 EB
0000000070: E8 F7 E8 FF 20 EF F0 E8 20 EF EE EB F3 F7 E5 ED
0000000080: E8 E8 20 E8 E7 EC E5 ED E5 ED E8 E9 20 F1 20 EE
0000000090: F7 ED EE E2 ED EE E9 20 E2 E5 F2 EA E8 20 3E 0D
00000000A0: 0A 3C 20 C0 20 F2 E5 EF E5 F0 FC 20 E2 ED EE F1
00000000B0: E8 EC 20 E8 E7 EC E5 ED E5 ED E8 FF 20 E2 20 E4
00000000C0: EE EF EE EB ED E8 F2 E5 EB FC ED EE E9 20 E8 20
00000000D0: F1 EC EE F2 F0 E8 EC 20 EA E0 EA 20 EF E5 F0 E5
00000000E0: E4 E0 FE F2 F1 FF 20 E2 20 EE F1 ED EE E2 ED F3
00000000F0: FE 20 3E 0D 0A 0D 0A 3C 20 2D 2D 2D 2D 2D 2D 2D
==========Here the txt fragment where differences is===== ======= ======
Language qsl;
dataname Mobile; < 15.08.2008 >
< Проверка еще раз - чтобы посмотреть как показывает отличия при получении изменений с очновной ветки >
< А теперь вносим изменения в дополнительной и смотрим как передаются в основную >
< ------- ------- ------- ----- = 1 = ------- ------- ------- ------- ---- >
======= ======= =======
What additional information I can give to help to resolve this bug ?
Thank you.