Comment 23 for bug 135320

Don't know if this is related to the same kind of problem. I'm not using filenames with UTF-8 characters, so I don't think it's directly related.... but anyway, here it goes. From .bzr.log:

0.123 encoding stdout as sys.stdout encoding 'UTF-8'
0.124 bzr arguments: [u'merge', u'--remember', u'/home/antoranz/eclipse/workspace/interfaces/']
0.124 looking for plugins in /home/antoranz/.bazaar/plugins
0.124 looking for plugins in /usr/lib/python2.5/site-packages/bzrlib/plugins
0.125 Plugin name __init__ already loaded
0.125 Plugin name __init__ already loaded
0.247 opening working tree '/home/antoranz/RSN/interfaces/stable'
0.284 Using fetch logic to copy between KnitPackRepository('file:///home/antoranz/eclipse/workspace/interfaces/.bzr/repository/')(<RepositoryFormatKnitPack1>) and KnitPackReposit
ory('file:///home/antoranz/RSN/interfaces/stable/.bzr/repository/')(<RepositoryFormatKnitPack1>)
[ 1019] 2008-06-19 15:01:29.015 INFO: +N docs/interfaces/contables/edc/20070630COZ900GENEDC101.FT
[ 1019] 2008-06-19 15:01:29.015 INFO: +N docs/interfaces/contables/edc/DF-FINANZAS-VBATCH-CARGUE_EDC.xls
[ 1019] 2008-06-19 15:01:29.016 INFO: +N docs/interfaces/contables/edc/th_edc01.4gl
[ 1019] 2008-06-19 15:01:29.016 INFO: +N docs/interfaces/topsoft/12df/20070316COZ901MDGIPV201.FT
[ 1019] 2008-06-19 15:01:29.016 INFO: +N docs/interfaces/topsoft/12df/th_pv03.4gl
[ 1019] 2008-06-19 15:01:29.016 INFO: +N docs/interfaces/topsoft/15df/Compras.xls
[ 1019] 2008-06-19 15:01:29.017 INFO: +N docs/interfaces/topsoft/16df/Importaciones.xls
[ 1019] 2008-06-19 15:01:29.017 INFO: +N docs/interfaces/topsoft/ts03/Cesion.xls
[ 1019] 2008-06-19 15:01:29.017 INFO: +N interfaces/clases/Interfaz_12DF.php
[ 1019] 2008-06-19 15:01:29.017 INFO: +N interfaces/clases/Interfaz_TS04.php
[ 1019] 2008-06-19 15:01:29.018 INFO: RM* docs/interfaces/contables/13df/13DF-FINANZAS-VENTANA_BATCH-PAGOS_EFECTUADOS ok.xls => docs/interfaces/contables/13df/DF-FINANZAS-VENTANA_
BATCH-PAGOS_EFECTUADOS.xls
[ 1019] 2008-06-19 15:01:29.018 INFO: M docs/interfaces/contables/edc/edc.sql
[ 1019] 2008-06-19 15:01:29.018 INFO: RM* docs/interfaces/topsoft/12df/12DF-FINANZAS-VENTANA_BATCH-RAPELES_APORTACIONES ok.xls => docs/interfaces/topsoft/12df/12DF-FINANZAS-VENTAN
A_BATCH-RAPELES_APORTACIONES.xls
[ 1019] 2008-06-19 15:01:29.019 INFO: M docs/interfaces/topsoft/12df/12df.sql
[ 1019] 2008-06-19 15:01:29.019 INFO: M docs/interfaces/topsoft/15df/15df.sql
[ 1019] 2008-06-19 15:01:29.019 INFO: M docs/interfaces/topsoft/16df/16df.sql
[ 1019] 2008-06-19 15:01:29.019 INFO: M docs/interfaces/topsoft/ts03/ts03.sql
[ 1019] 2008-06-19 15:01:29.020 INFO: M docs/interfaces/topsoft/ts04/carr54.php
[ 1019] 2008-06-19 15:01:29.020 INFO: M docs/interfaces/topsoft/ts04/ts04.sql
[ 1019] 2008-06-19 15:01:29.020 INFO: M docs/status_interfaces.txt
[ 1019] 2008-06-19 15:01:29.021 INFO: M interfaces/Comprobante.php
[ 1019] 2008-06-19 15:01:29.021 INFO: M interfaces/Contabilidad.php

UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 31: ordinal not in range(128)

0.722 return code 4

This was the output from the merge:
bzr merge --remember /home/antoranz/eclipse/workspace/interfaces/
+N docs/interfaces/contables/edc/20070630COZ900GENEDC101.FT
+N docs/interfaces/contables/edc/DF-FINANZAS-VBATCH-CARGUE_EDC.xls
+N docs/interfaces/contables/edc/th_edc01.4gl
+N docs/interfaces/topsoft/12df/20070316COZ901MDGIPV201.FT
+N docs/interfaces/topsoft/12df/th_pv03.4gl
+N docs/interfaces/topsoft/15df/Compras.xls
+N docs/interfaces/topsoft/16df/Importaciones.xls
+N docs/interfaces/topsoft/ts03/Cesion.xls
+N interfaces/clases/Interfaz_12DF.php
+N interfaces/clases/Interfaz_TS04.php
RM* docs/interfaces/contables/13df/13DF-FINANZAS-VENTANA_BATCH-PAGOS_EFECTUADOS ok.xls => docs/interfaces/contables/13df/DF-FINANZAS-VENTANA_BATCH-PAGOS_EFECTUADOS.xls
 M docs/interfaces/contables/edc/edc.sql
RM* docs/interfaces/topsoft/12df/12DF-FINANZAS-VENTANA_BATCH-RAPELES_APORTACIONES ok.xls => docs/interfaces/topsoft/12df/12DF-FINANZAS-VENTANA_BATCH-RAPELES_APORTACIONES.xls
 M docs/interfaces/topsoft/12df/12df.sql
 M docs/interfaces/topsoft/15df/15df.sql
 M docs/interfaces/topsoft/16df/16df.sql
 M docs/interfaces/topsoft/ts03/ts03.sql
 M docs/interfaces/topsoft/ts04/carr54.php
 M docs/interfaces/topsoft/ts04/ts04.sql
 M docs/status_interfaces.txt
 M interfaces/Comprobante.php
 M interfaces/Contabilidad.php
 M interfaces/Interfaces.php
 M interfaces/InterfazContable.php
 M interfaces/clases/Interfaz_EDC.php
All changes applied successfully.
bzr: ERROR: exceptions.UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 31: ordinal not in range(128)

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 846, in run_bzr_catch_errors
    return run_bzr(argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 797, in run_bzr
    ret = run(*run_argv)
  File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 499, in run_argv_aliases
    return self.run(**all_cmd_args)
  File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 2925, in run
    cleanup()
  File "/usr/lib/python2.5/site-packages/bzrlib/workingtree_4.py", line 1131, in unlock
    self.flush()
  File "/usr/lib/python2.5/site-packages/bzrlib/workingtree_4.py", line 291, in flush
    self.current_dirstate().save()
  File "/usr/lib/python2.5/site-packages/bzrlib/dirstate.py", line 2066, in save
    self._state_file.writelines(self.get_lines())
  File "/usr/lib/python2.5/site-packages/bzrlib/dirstate.py", line 1591, in get_lines
    return self._get_output_lines(lines)
  File "/usr/lib/python2.5/site-packages/bzrlib/dirstate.py", line 1928, in _get_output_lines
    inventory_text = '\0\n\0'.join(lines)
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 31: ordinal not in range(128)

bzr 1.5 on python 2.5.2 (linux2)
arguments: ['/usr/bin/bzr', 'merge', '--remember', '/home/antoranz/eclipse/workspace/interfaces/']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'es_CO.UTF-8'
plugins:
  gtk /usr/lib/python2.5/site-packages/bzrlib/plugins/gtk [0.93.0]
  launchpad /usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad [unknown]
*** Bazaar has encountered an internal error.
    Please report a bug at https://bugs.launchpad.net/bzr/+filebug
    including this traceback, and a description of what you
    were doing when the error occurred.

I can check the busted repository and everything "looks" OK... however, It reports 388 revisions but if I count revnos from log, I get a different number. I don't think that's OK. Is it?:
$ bzr check; bzr log | grep revno | wc -l
checked branch file:///home/antoranz/RSN/interfaces/stable%20malo/ format Bazaar Branch Format 6 (bzr 0.15)
checked repository <bzrlib.transport.local.LocalTransport url=file:///home/antoranz/RSN/interfaces/stable%20malo/> format <RepositoryFormatKnitPack1>
   388 revisions
   389 file-ids
   932 unique file texts
 90360 repeated file texts
     0 unreferenced text versions
370

I have just used a backup of the repository (the broken one) of some days ago and tried to merge the same branch that busted my repository and it worked OK. Do you have any comments or Ideas? I'll save the broken repository in case you want me to try something. I'll keep on working.