bzr merge with svn repository (no common ancestors) failed
| Affects | Status | Importance | Assigned to | Milestone | |
|---|---|---|---|---|---|
| Bazaar |
New
|
Undecided
|
Unassigned | ||
| Bazaar Subversion Plugin |
Invalid
|
Undecided
|
Unassigned | ||
Bug Description
I worked on a piece of code over an extended period of time offline. I thought this was a good time to start using bzr so I could also do local commits. Then using the svn plugin, i wanted to my my newly written code (no common ancestor in svn repository) with an empty directory within a svn repository so that I can push my code (including its history) to my colleagues who are not yet using bzr. Since I'm still very new to bzr, it is clearly possible that I simply didn't use the right arguments. However, since the output suggested I file a bug report, I hereby do so in the hope that if there is a real bug, it can be resolved. If it is not a bug but a usage error, a slightly more helpful error message would be great.
$ bzr merge -r0..1 svn+ssh:
bzr: ERROR: exceptions.
Traceback (most recent call last):
File "/Library/
return run_bzr(argv)
File "/Library/
ret = run(*run_argv)
File "/Library/
return self.run(
File "/Library/
verified)
File "/Library/
conflict_count = merger.do_merge()
File "/Library/
self.
File "/Library/
merge.
File "/Library/
self.
File "/Library/
file_status = self.merge_
File "/Library/
self.
File "/Library/
raise AssertionError(
AssertionError: Unknown kind 'absent'
bzr 1.9 on python 2.5.1 (darwin)
arguments: ['/Users/
encoding: 'UTF-8', fsenc: 'utf-8', lang: 'en_US.UTF-8'
plugins:
launchpad /Library/
rebase /Library/
svn /Library/
xmloutput /Library/
*** 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.
| Jó (jo-bitsch) wrote | #1 |
| Jelmer Vernooij (jelmer) wrote | #2 |
| Jelmer Vernooij (jelmer) wrote | #3 |
| Changed in bzr-svn: | |
| status: | New → Incomplete |
| Changed in bzr-svn: | |
| status: | Incomplete → Invalid |
| James Westby (james-w) wrote | #4 |
| Jelmer Vernooij (jelmer) wrote | #5 |
The way I was able to push my code to the server in the end was:
in a rich-root shared repository
mkdir try
cd try
bzr checkout svn+ssh:
bzr merge -r0..9 ../branch #9 revisions in the other branch
bzr nick other-test
bzr commit
as I figured, i couldn't see the history of my code from within svn(more reason for my colleagues to also use bzr) but nevertheless my colleagues now have access to my work which I was doing while I was offline... I hope that description clarifies my usage scenario and helps other people who try the same.