Comment 7 for bug 135320

Revision history for this message
Edmundo (eantoranz) wrote : Re: [Bug 135320] Re: bzr merge - exceptions.UnicodeDecodeError

This is what I was able to make in a simple attempt (not exactly what
happend before). See what you can make out of it:

$ bzr version
Bazaar (bzr) 1.3.1rc1
  Python interpreter: /usr/bin/python 2.5.1.final.0
  Python standard library: /usr/lib/python2.5
  bzrlib: /usr/lib/python2.5/site-packages/bzrlib
  Bazaar configuration: /home/antoranz/.bazaar
  Bazaar log file: /home/antoranz/.bzr.log

Copyright 2005, 2006, 2007, 2008 Canonical Ltd.
http://bazaar-vcs.org/

bzr comes with ABSOLUTELY NO WARRANTY. bzr is free software, and
you may use, modify and redistribute it under the terms of the GNU
General Public License version 2 or later.

$ bzr status
$ bzr status -v
$ bzr branch . ../test
Branched 26 revision(s).
$ cd ../test/
$ bzr status
$ bzr mv doc/Cities/Bogota/ doc/Cities/Bogotá
doc/Cities/Bogota => doc/Cities/Bogotá
$ bzr status
renamed:
  doc/Cities/Bogota => doc/Cities/Bogotá
$ bzr commit -m "A"
Committing to: /home/antoranz/bus/test/
renamed doc/Cities/Bogota => doc/Cities/Bogotá
Committed revision 27.
$ bzr status
$ bzr mv doc/Cities/Bogotá/ doc/Cities/Bogota
doc/Cities/Bogotá => doc/Cities/Bogota
$ bzr status
renamed:
  doc/Cities/Bogotá => doc/Cities/Bogota
$ bzr commit -m "B"
Committing to: /home/antoranz/bus/test/
renamed doc/Cities/Bogotá => doc/Cities/Bogota
bzr: ERROR: An inconsistent delta was supplied involving
'doc/Cities/Bogota\xa1/AV Villas.png',
'avvillas.png-20080408194113-wt267gqqk9qfq7jt-1'
reason: working tree does not contain new entry
$ bzr status
working tree is out of date, run 'bzr update'
renamed:
  doc/Cities/Bogotá => doc/Cities/Bogota
$ bzr update
All changes applied successfully.
Updated to revision 28.
$ bzr status
$ ls doc/Cities/
Bogota compress.sh Maracaibo
$ bzr check
checked branch file:///home/antoranz/bus/test/ format Bazaar Branch
Format 6 (bzr 0.15)
checked repository <bzrlib.transport.local.LocalTransport
url=file:///home/antoranz/bus/test/> format
<RepositoryFormatKnitPack1>
   187 revisions
   123 file-ids
   534 unique file texts
  7936 repeated file texts
     0 unreferenced text versions