bzr is not able to merge from one branch because an Unicode error
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
Medium
|
Unassigned |
Bug Description
When I try to merge two branches I get this error:
bzr 0.7pre invoked on python 2.4.2.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'merge', '../archive/
working dir: u'/home/
looking for plugins in /usr/lib/
add plugin name __init__
add plugin name __init__
add plugin name __init__
add plugin name bzrtools
load plugin (<open file '/usr/lib/
loaded succesfully
load plugin (None, '/usr/lib/
registered plugin command shelve
registered plugin command unshelve
registered plugin command clean-tree
registered plugin command graph-ancestry
registered plugin command fetch-ghosts
registered plugin command patch
registered plugin command shell
registered plugin command fix
registered plugin command branch-history
registered plugin command baz-import
registered plugin command push
loaded succesfully
looking for plugins in /home/carlos/
got branch format u'Bazaar-NG branch, format 6\n'
lock read: BzrBranch(
unlock: BzrBranch(
lock read: BzrBranch(
unlock: BzrBranch(
lock read: BzrBranch(
unlock: BzrBranch(
lock read: BzrBranch(
unlock: BzrBranch(
lock read: BzrBranch(
unlock: BzrBranch(
lock read: BzrBranch(
unlock: BzrBranch(
start compare_trees
start looking for new files
got branch format u'Bazaar-NG branch, format 6\n'
lock read: BzrBranch(
unlock: BzrBranch(
lock read: BzrBranch(
fetch up to rev {<email address hidden>}
lock read: BzrBranch(
unlock: BzrBranch(
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get revision {<email address hidden>}
need to get 39 revisions in total
copying revision {<email address hidden>}
lock read: BzrBranch(
unlock: BzrBranch(
cache hit in WeaveStore(
unlock: BzrBranch(
[12595] Thu 09:23:13.066 ERROR: exceptions.
at /usr/lib/
in write
Traceback (most recent call last):
File "/usr/lib/
return run_bzr(argv)
File "/usr/lib/
ret = cmd_obj.
File "/usr/lib/
return self.run(
File "/usr/lib/
show_
File "/usr/lib/
merger.
File "/usr/lib/
self.
File "/usr/lib/
return branch, get_revid_
File "/usr/lib/
greedy_
File "/usr/lib/
f = Fetcher(to_branch, from_branch, revision, pb)
File "/usr/lib/
self.
File "/usr/lib/
self.
File "/usr/lib/
self.
File "/usr/lib/
len(
File "/usr/lib/
_trace_
File "/usr/lib/
return self.writer.
File "/usr/lib/
data, consumed = self.encode(object, self.errors)
UnicodeDecodeError: 'ascii' codec can't decode byte 0xc3 in position 24: ordinal not in range(128)
return code 3
And this is the log of the conversation with Martin Pool to fix it:
mpool well can you try just commenting out the mutter statement at fetch.py l195?
carlos in my current tree or the checkout that lifeless asked me to download?
mpool of bzr?
carlos yes
mpool either one
carlos ok
mpool whichever you're running
carlos ok
mpool hm i wonder how that got in there
carlos mutter(' commiter %s, %d parents',
carlos rev.committer,
carlos len(rev.
carlos That?
mpool yep
carlos it does not break now
carlos but seems to be stalled...
carlos eating my CPU
carlos ok, forget that. It's working now
carlos thank you!
mpool oh great
mpool please, file a bug with the traceback so i don't forget
carlos ok
mpool i will write a regression test but not tonight :)
carlos ok
Changed in bzr: | |
status: | New → Fixed |
Description of cause of bug plus patch to fix it here: article. gmane.org/ gmane.comp. version- control. bazaar- ng.general/ 5578
http://
(the above fix of removing the mutter() call just side-steps the issue).