merging into a new branch leaves working tree in bad state (bzr: ERROR: exceptions.ValueError: WorkingTree.set_root_id with fileid=None)
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Medium
|
Unassigned |
Bug Description
I created a new branch with "bzr init branchname", then within the resulting directory used "bzr merge path" to merge in an existing branch. This appeared to work, but subsequent calls to "bzr status" reported "working tree is out of date, run 'bzr update'". Doing so produced this trace:
Traceback (most recent call last):
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/
show_
File "/Library/
return self._update_
File "/Library/
return unbound(self, *args, **kwargs)
File "/Library/
self.
File "/Library/
return unbound(self, *args, **kwargs)
File "/Library/
'WorkingTre
ValueError: WorkingTree.
bzr 2.3.1 on python 2.6.1 (Darwin-
arguments: ['/usr/
encoding: 'UTF-8', fsenc: 'utf-8', lang: 'en_US.UTF-8'
plugins:
bash_completion /Library/
bzrp4 /Library/
bzrtools /Library/
colo /Library/
email /Library/
explorer /Library/
extmerge /Library/
fastimport /Users/
keychain /Library/
launchpad /Library/
loom /Library/
netrc_
news_merge /Library/
pipeline /Library/
qbzr /Library/
rewrite /Library/
svn /Library/
upload /Library/
xmloutput /Library/
"bzr status" also shows odd output, including the following nonsensical rename:
$ bzr status
working tree is out of date, run 'bzr update'
renamed:
.bzrignore => .bzrignore
Probably a duplicate of bug 82555 but the traceback is fun, maybe the recent fix to bug 242175 will help?
Steps to repo:
$ bzr init tmp1 ValueError: WorkingTree. set_root_ id with fileid=None
Created a standalone tree (format: 2a)
$ touch tmp1/file
$ bzr add tmp1
adding file
$ bzr commit -m "Adding file" tmp1
Committing to: /.../tmp1/
added file
Committed revision 1.
$ bzr init tmp2
Created a standalone tree (format: 2a)
$ bzr merge -d tmp2 tmp1
+N file
All changes applied successfully.
$ bzr st tmp2
working tree is out of date, run 'bzr update'
renamed:
file => file
$ bzr update tmp2
bzr: ERROR: exceptions.
...