It is reproducible in a simple example (feel free to use this as a test case):
nmb@guttle[~/tmp]$ bzr init test1
rCreated a standalone tree (format: 2a)
nmb@guttle[~/tmp]$ bzr branch test1 test2
Branched 0 revision(s).
nmb@guttle[~/tmp]$ cd test1
nmb@guttle[~/tmp/test1]$ echo "content" > file1
nmb@guttle[~/tmp/test1]$ bzr ci -m 'first trunk revision'
Committing to: /Users/nmb/tmp/test1/
aborting commit write group: PointlessCommit(No changes to commit)
bzr: ERROR: No changes to commit. Use --unchanged to commit anyhow.
nmb@guttle[~/tmp/test1]$ bzr add file1
adding file1
nmb@guttle[~/tmp/test1]$ bzr ci -m 'first trunk revision'
Committing to: /Users/nmb/tmp/test1/
added file1
Committed revision 1.
nmb@guttle[~/tmp/test1]$ cd ../test2
nmb@guttle[~/tmp/test2]$ bzr merge
Merging from remembered parent location /Users/nmb/tmp/test1/
+N file1
All changes applied successfully.
nmb@guttle[~/tmp/test2]$ bzr ci -m 'merge first revision'
Committing to: /Users/nmb/tmp/test2/
deleted
modified file1
Committed revision 1.
nmb@guttle[~/tmp/test2]$ cd ../test1
nmb@guttle[~/tmp/test1]$ bzr merge ../test2
All changes applied successfully.
nmb@guttle[~/tmp/test1]$ bzr st
pending merge tips: (use -v to see all merge revisions)
Neil Martinsen-Bu... 2010-11-18 merge first revision
nmb@guttle[~/tmp/test1]$ bzr ci -m 'make the branches identical'
Committing to: /Users/nmb/tmp/test1/
Committed revision 2.
nmb@guttle[~/tmp/test1]$ echo "more contents" >> file1
nmb@guttle[~/tmp/test1]$ bzr ci -m 'trunk version'
Committing to: /Users/nmb/tmp/test1/
modified file1
Committed revision 3.
nmb@guttle[~/tmp/test1]$ cd ../test2
nmb@guttle[~/tmp/test2]$ echo "aggle flaggle klabble!" >> file1
-bash: !": event not found
nmb@guttle[~/tmp/test2]$ echo 'aggle flaggle klabble!' >> file1
nmb@guttle[~/tmp/test2]$ bzr ci -m 'branch revision'
Committing to: /Users/nmb/tmp/test2/
modified file1
Committed revision 2.
nmb@guttle[~/tmp/test2]$ cd ../test1
nmb@guttle[~/tmp/test1]$ bzr merge
Merging from remembered submit location /Users/nmb/tmp/test2/
M file1
Text conflict in file1
1 conflicts encountered.
nmb@guttle[~/tmp/test1]$ bzr resolve --take-other file1
bzr: ERROR: exceptions.AttributeError: 'NoneType' object has no attribute 'lower'
Traceback (most recent call last):
File "/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/commands.py", line 912, in exception_to_return_code
return the_callable(*args, **kwargs)
File "/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/commands.py", line 1112, in run_bzr
ret = run(*run_argv)
File "/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/commands.py", line 690, in run_argv_aliases
return self.run(**all_cmd_args)
File "/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/commands.py", line 705, in run
return self._operation.run_simple(*args, **kwargs)
File "/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/cleanup.py", line 135, in run_simple
self.cleanups, self.func, *args, **kwargs)
File "/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
result = func(*args, **kwargs)
File "/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/conflicts.py", line 160, in run
resolve(tree, file_list, action=action)
File "/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/conflicts.py", line 189, in resolve
conflict._do(action, tree)
File "/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/conflicts.py", line 415, in _do
meth(tree)
File "/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/conflicts.py", line 549, in action_take_other
winner='other')
File "/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/conflicts.py", line 444, in _resolve_with_cleanups
op.run_simple(tt, *args, **kwargs)
File "/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/cleanup.py", line 135, in run_simple
self.cleanups, self.func, *args, **kwargs)
File "/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/cleanup.py", line 165, in _do_with_cleanups
result = func(*args, **kwargs)
File "/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/conflicts.py", line 508, in _resolve
tt.apply()
File "/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/transform.py", line 1516, in apply
self._check_malformed()
File "/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/transform.py", line 509, in _check_malformed
conflicts = self.find_conflicts()
File "/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/transform.py", line 500, in find_conflicts
conflicts.extend(self._duplicate_entries(by_parent))
File "/Library/Frameworks/Python.framework/Versions/2.6/lib/python2.6/site-packages/bzrlib/transform.py", line 642, in _duplicate_entries
name_ids = [(n.lower(), t) for n, t in name_ids]
AttributeError: 'NoneType' object has no attribute 'lower'
*** Bazaar has encountered an internal error. This probably indicates a
bug in Bazaar. You can help us fix it by filing a bug report at https://bugs.launchpad.net/bzr/+filebug
including this traceback and a description of the problem.
It is reproducible in a simple example (feel free to use this as a test case):
nmb@guttle[~/tmp]$ bzr init test1 ~/tmp/test1] $ echo "content" > file1 ~/tmp/test1] $ bzr ci -m 'first trunk revision' nmb/tmp/ test1/ ~/tmp/test1] $ bzr add file1 ~/tmp/test1] $ bzr ci -m 'first trunk revision' nmb/tmp/ test1/ ~/tmp/test1] $ cd ../test2 ~/tmp/test2] $ bzr merge nmb/tmp/ test1/ ~/tmp/test2] $ bzr ci -m 'merge first revision' nmb/tmp/ test2/ ~/tmp/test2] $ cd ../test1 ~/tmp/test1] $ bzr merge ../test2 ~/tmp/test1] $ bzr st ~/tmp/test1] $ bzr ci -m 'make the branches identical' nmb/tmp/ test1/ ~/tmp/test1] $ echo "more contents" >> file1 ~/tmp/test1] $ bzr ci -m 'trunk version' nmb/tmp/ test1/ ~/tmp/test1] $ cd ../test2 ~/tmp/test2] $ echo "aggle flaggle klabble!" >> file1 ~/tmp/test2] $ echo 'aggle flaggle klabble!' >> file1 ~/tmp/test2] $ bzr ci -m 'branch revision' nmb/tmp/ test2/ ~/tmp/test2] $ cd ../test1 ~/tmp/test1] $ bzr merge nmb/tmp/ test2/ ~/tmp/test1] $ bzr resolve --take-other file1 AttributeError: 'NoneType' object has no attribute 'lower'
rCreated a standalone tree (format: 2a)
nmb@guttle[~/tmp]$ bzr branch test1 test2
Branched 0 revision(s).
nmb@guttle[~/tmp]$ cd test1
nmb@guttle[
nmb@guttle[
Committing to: /Users/
aborting commit write group: PointlessCommit(No changes to commit)
bzr: ERROR: No changes to commit. Use --unchanged to commit anyhow.
nmb@guttle[
adding file1
nmb@guttle[
Committing to: /Users/
added file1
Committed revision 1.
nmb@guttle[
nmb@guttle[
Merging from remembered parent location /Users/
+N file1
All changes applied successfully.
nmb@guttle[
Committing to: /Users/
deleted
modified file1
Committed revision 1.
nmb@guttle[
nmb@guttle[
All changes applied successfully.
nmb@guttle[
pending merge tips: (use -v to see all merge revisions)
Neil Martinsen-Bu... 2010-11-18 merge first revision
nmb@guttle[
Committing to: /Users/
Committed revision 2.
nmb@guttle[
nmb@guttle[
Committing to: /Users/
modified file1
Committed revision 3.
nmb@guttle[
nmb@guttle[
-bash: !": event not found
nmb@guttle[
nmb@guttle[
Committing to: /Users/
modified file1
Committed revision 2.
nmb@guttle[
nmb@guttle[
Merging from remembered submit location /Users/
M file1
Text conflict in file1
1 conflicts encountered.
nmb@guttle[
bzr: ERROR: exceptions.
Traceback (most recent call last): Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ commands. py", line 912, in exception_ to_return_ code Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ commands. py", line 1112, in run_bzr Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ commands. py", line 690, in run_argv_aliases **all_cmd_ args) Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ commands. py", line 705, in run .run_simple( *args, **kwargs) Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ cleanup. py", line 135, in run_simple Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ cleanup. py", line 165, in _do_with_cleanups Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ conflicts. py", line 160, in run Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ conflicts. py", line 189, in resolve _do(action, tree) Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ conflicts. py", line 415, in _do Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ conflicts. py", line 549, in action_take_other Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ conflicts. py", line 444, in _resolve_ with_cleanups run_simple( tt, *args, **kwargs) Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ cleanup. py", line 135, in run_simple Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ cleanup. py", line 165, in _do_with_cleanups Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ conflicts. py", line 508, in _resolve Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ transform. py", line 1516, in apply _check_ malformed( ) Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ transform. py", line 509, in _check_malformed conflicts( ) Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ transform. py", line 500, in find_conflicts extend( self._duplicate _entries( by_parent) ) Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ transform. py", line 642, in _duplicate_entries
File "/Library/
return the_callable(*args, **kwargs)
File "/Library/
ret = run(*run_argv)
File "/Library/
return self.run(
File "/Library/
return self._operation
File "/Library/
self.cleanups, self.func, *args, **kwargs)
File "/Library/
result = func(*args, **kwargs)
File "/Library/
resolve(tree, file_list, action=action)
File "/Library/
conflict.
File "/Library/
meth(tree)
File "/Library/
winner='other')
File "/Library/
op.
File "/Library/
self.cleanups, self.func, *args, **kwargs)
File "/Library/
result = func(*args, **kwargs)
File "/Library/
tt.apply()
File "/Library/
self.
File "/Library/
conflicts = self.find_
File "/Library/
conflicts.
File "/Library/
name_ids = [(n.lower(), t) for n, t in name_ids]
AttributeError: 'NoneType' object has no attribute 'lower'
bzr 2.3.0dev2 on python 2.6.5 (Darwin- 10.4.0- i386-32bit) Frameworks/ Python. framework/ Versions/ Current/ bin/bzr' , 'resolve', '--take-other', 'file1'] nmb/.bazaar/ plugins/ automirror [0.1.0] Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ plugins/ bash_completion [2.3.0dev2] nmb/.bazaar/ plugins/ bzrtools [2.3.0] nmb/.bazaar/ plugins/ colo [0.2.1dev] log_formatter /Users/ nmb/.bazaar/ plugins/ deleted_ log_formatter. py [unknown] nmb/.bazaar/ plugins/ explorer [1.1.2dev] nmb/.bazaar/ plugins/ fastimport [0.9.0dev] nmb/.bazaar/ plugins/ git [0.5.3dev] nmb/.bazaar/ plugins/ hg [0.2.0dev] version_ info /Users/ nmb/.bazaar/ plugins/ latex_version_ info [0.0.2] Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ plugins/ launchpad [2.3.0dev2] credential_ store /Library/ Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ plugins/ netrc_credentia l_store [2.3.0dev2] Frameworks/ Python. framework/ Versions/ 2.6/lib/ python2. 6/site- packages/ bzrlib/ plugins/ news_merge [2.3.0dev2] nmb/.bazaar/ plugins/ qbzr [0.20.0dev1] nmb/.bazaar/ plugins/ rst2html [0.0.2]
arguments: ['/Library/
encoding: 'UTF-8', fsenc: 'utf-8', lang: 'en_US.UTF-8'
plugins:
automirror /Users/
bash_completion /Library/
bzrtools /Users/
colo /Users/
deleted_
explorer /Users/
fastimport /Users/
git /Users/
hg /Users/
latex_
launchpad /Library/
netrc_
news_merge /Library/
qbzr /Users/
rst2html /Users/
*** Bazaar has encountered an internal error. This probably indicates a /bugs.launchpad .net/bzr/ +filebug
bug in Bazaar. You can help us fix it by filing a bug report at
https:/
including this traceback and a description of the problem.