dirstate updating fails if there are symlinks and non-ascii filenames
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
Medium
|
John A Meinel |
Bug Description
The following occured with my branches. Many files and directories were added, moved, removed and renamed in the branches (gv-allgemein was removed from this branch but nor from the merge source):
bzr merge sftp://
+N .bzrignore.OTHER
+N gv-allgemein/
+N gv-allgemein/
+N gv-allgemein/
+N gv-allgemein/
+N gv-allgemein/
+N gv-allgemein/
+N gv-allgemein/
+N gv-allgemein/
+N gv-allgemein/
+N gv-allgemein/
...
+N src/batch/
+N src/batch/
+N src/batch/
...
M src/tech/
M src/tech/
Contents conflict in .bzrignore
Conflict adding files to gv-allgemein. Created directory.
Conflict because gv-allgemein is not versioned, but has versioned children. Versioned directory.
Conflict adding files to gv-allgemein/
Conflict because gv-allgemein/
Conflict adding files to gv-allgemein/
Conflict because gv-allgemein/
Contents conflict in gv-allgemein/
Conflict adding files to gv-allgemein/
Conflict because gv-allgemein/
Contents conflict in gv-allgemein/
Contents conflict in gv-allgemein/
...
Text conflict in src/geschaeft/
Text conflict in src/geschaeft/
75 conflicts encountered.
bzr: ERROR: exceptions.
Traceback (most recent call last):
File "/u/users/
return run_bzr(argv)
File "/u/users/
ret = run(*run_argv)
File "/u/users/
return self.run(
File "/u/users/
cleanup()
File "/u/users/
self.flush()
File "/u/users/
self.
File "/u/users/
self.
File "/u/users/
return self._get_
File "/u/users/
inventory_text = '\0\n\0'
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 29: ordinal not in range(128)
bzr 0.90.0candidate0 on python 2.5.0.final.0 (linux2)
arguments: ['/u/users/
** please send this report to <email address hidden>
/u/users/
warn("file group %r was not explicitly unlocked" % self)
/u/users/
warn("lock on %r not released" % self.f)
Related branches
Changed in bzr: | |
importance: | Undecided → Medium |
status: | New → Triaged |
Changed in bzr: | |
status: | Triaged → Fix Committed |
I got the same (or similar) problem yesterday when merging changes from my development branch to my stable branch:
$ bzr merge /home/antoranz/ bus/eclipse Bogotá/ TransMilenio A.png Bogotá/ TransMilenio B.png Bogotá/ TransMilenio C.png Bogotá/ TransMilenio D.png Bogotá/ city.xml Maracaibo/ city.xml includes/ city/ProcessedC ity.php js/public_ transport. js.php seeloadedcity. php UnicodeDecodeEr ror: 'ascii' codec can't decode byte 0xc3 in position 16: ordinal not in range(128)
+N doc/Cities/Bogotá/
+N doc/Cities/
+N doc/Cities/
+N doc/Cities/
+N doc/Cities/
+N doc/Cities/
M doc/Cities/
M web/server/
M web/server/
M web/server/
All changes applied successfully.
bzr: ERROR: exceptions.
Traceback (most recent call last): python2. 5/site- packages/ bzrlib/ commands. py", line 802, in run_bzr_ catch_errors python2. 5/site- packages/ bzrlib/ commands. py", line 758, in run_bzr python2. 5/site- packages/ bzrlib/ commands. py", line 492, in run_argv_aliases **all_cmd_ args) python2. 5/site- packages/ bzrlib/ builtins. py", line 2879, in run python2. 5/site- packages/ bzrlib/ workingtree_ 4.py", line 1117, in unlock python2. 5/site- packages/ bzrlib/ workingtree_ 4.py", line 296, in flush current_ dirstate( ).save( ) python2. 5/site- packages/ bzrlib/ dirstate. py", line 1974, in save _state_ file.writelines (self.get_ lines() ) python2. 5/site- packages/ bzrlib/ dirstate. py", line 1506, in get_lines output_ lines(lines) python2. 5/site- packages/ bzrlib/ dirstate. py", line 1842, in _get_output_lines .join(lines)
File "/usr/lib/
return run_bzr(argv)
File "/usr/lib/
ret = run(*run_argv)
File "/usr/lib/
return self.run(
File "/usr/lib/
cleanup()
File "/usr/lib/
self.flush()
File "/usr/lib/
self.
File "/usr/lib/
self.
File "/usr/lib/
return self._get_
File "/usr/lib/
inventory_text = '\0\n\0'
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 16: ordinal not in range(128)
bzr 1.0.0 on python 2.5.1.final.0 (linux2) antoranz/ bus/eclipse' ] python2. 5/site- packages/ bzrlib/ plugins/ gtk [0.93.0] python2. 5/site- packages/ bzrlib/ plugins/ launchpad [unknown] python2. 5/site- packages/ bzrlib/ plugins/ multiparent. pyc [unknown] /bugs.launchpad .net/bzr/ +filebug python2. 5/site- packages/ bzrlib/ lockable_ files.py: 110: UserWarning: file group LockableFiles( <bzrlib. transport. local.LocalTran sport url=file: ///home/ antoranz/ bus/stable/ .bzr/checkout/ >) was not explicitly unlocked python2. 5/site- packages/ bzrlib/ lock.py: 79: UserWarning: lock on <open file u'/home/ antoranz/ bus/stable/ .bzr/checkout/ dirstate' , mode 'rb+' at 0x86ab578> not released
arguments: ['/usr/bin/bzr', 'merge', '/home/
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'es_CO.UTF-8'
plugins:
gtk /usr/lib/
launchpad /usr/lib/
multiparent /usr/lib/
*** Bazaar has encountered an internal error.
Please report a bug at https:/
including this traceback, and a description of what you
were doing when the error occurred.
/usr/lib/
warn("file group %r was not explicitly unlocked" % self)
/usr/lib/
warn("lock on %r not released" % self.f)
$ bzr --version
Bazaar (bzr) 1.0.0
Python interpreter: /usr/bin/python 2.5.1.final.0
Python standard library: /usr/lib/python2.5
bzrlib: /usr/l...