Stack trace on colo branch merge/update
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Confirmed
|
Undecided
|
Unassigned |
Bug Description
Following the standard process for using colo (as I understand it, apologies if I have it wrong) I cannot merge from a branch back into the trunk. When I try to commit I can't however it says to run "update" but doing so results in a stack trace. Here are the rough steps I perform but I have included console output later on in the report.
Steps:
- Create colo workspace
- colo-init
- Create a branch (and switch to it)
- Do stuff.
- Commit changes
- switch to trunk
- merge changes
- bzr status - says to update
- bzr update - CRASH
- bzr commit - won't commit.
Please accept my apologies if this is just user error but thought I would raise the bug in case it wasn't.
Alex
Details
---------
OS: Ubuntu 10.10
Bazaar - 2.2.3 (from PPA)
Plugins:
- bash_completion 2.2.3
- bzrtools 2.2.0
- colo 0.2.0
- launchpad 2.2.3
- netrc_credentia
- news_merge 2.2.3
- pipeline 1.1.0
- svn 1.0.4
Commands and Output
-------
(09:20:00) projects> mkdir colo_test
(09:20:11) projects> cd colo_test/
(09:20:16) colo_test> bzr colo-init
(09:20:25) colo_test> bzr colo-branch branch1
Branched 0 revision(s).
Tree is up to date at revision 0.
Switched to branch: /media/
(09:20:38) colo_test> touch newfile.txt
(09:20:49) colo_test> gvim newfile.txt
(09:20:53) colo_test> bzr add newfile.txt
.bzr/ newfile.txt
(09:20:53) colo_test> bzr add newfile.txt
adding newfile.txt
(09:21:10) colo_test> bzr commit -m "Added new file"
Committing to: /media/
added newfile.txt
Committed revision 1.
(09:21:18) colo_test> bzr switch colo:trunk
Updated to revision 0.
Switched to branch: /media/
(09:21:29) colo_test> bzr status
(09:21:32) colo_test> bzr merge colo:branch1
+N newfile.txt
All changes applied successfully.
(09:21:40) colo_test> bzr status
working tree is out of date, run 'bzr update'
(09:21:43) colo_test> bzr update
bzr: failed to report crash using apport:
OSError(13, 'Permission denied')
bzr: ERROR: exceptions.
Traceback (most recent call last):
File "/usr/lib/
return the_callable(*args, **kwargs)
File "/usr/lib/
ret = run(*run_argv)
File "/usr/lib/
return self.run(
File "/usr/lib/
return self._operation
File "/usr/lib/
self.cleanups, self.func, *args, **kwargs)
File "/usr/lib/
result = func(*args, **kwargs)
File "/usr/lib/
old_
File "/usr/lib/
return self._update_
File "/usr/lib/
return unbound(self, *args, **kwargs)
File "/usr/lib/
self.
File "/usr/lib/
return unbound(self, *args, **kwargs)
File "/usr/lib/
'WorkingTre
ValueError: WorkingTree.
bzr 2.2.3 on python 2.6.6 (Linux-
arguments: ['/usr/bin/bzr', 'update']
encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'en_GB.utf8'
plugins:
bash_completion /usr/lib/
bzrtools /usr/lib/
colo /home/alewis/
launchpad /usr/lib/
netrc_
news_merge /usr/lib/
pipeline /usr/lib/
svn /usr/lib/
*** 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:/
including this traceback and a description of the problem.
(09:21:48) colo_test> bzr commit -m "Trying to commit"
Committing to: /media/
aborting commit write group: PointlessCommit(No changes to commit)
bzr: ERROR: No changes to commit. Use --unchanged to commit anyhow.
(09:29:20) colo_test>
The colocated workspace is not the source of the bug. This comes from bzr core. The following reproduces the same stack trace.
$ cd tmp
$ bzr init test
$ bzr branch test other
$ cd other
$ touch file.txt
$ bzr add
$ bzr ci -m 'added file'
$ cd ../test
$ bzr merge ../other
$ bzr st
$ bzr update
The essence of the problem seems to be that the original branch has no revisions in it, as the following works fine
$ bzr init test
$ cd test
$ bzr ci -m 'a revision' --unchanged
$ cd ..
$ bzr branch test other
$ cd other
$ touch file.txt
$ bzr add
$ bzr ci -m 'a new revision'
$ cd ../test
$ bzr merge ../other
$ bzr st
$ bzr update