Exception during merge --lca
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
Bazaar |
Fix Released
|
Medium
|
Aaron Bentley | ||
Debian |
Fix Released
|
Unknown
|
Bug Description
Hi,
Forwarding from Debian.
I get the following exception when trying to merge a feature branch
into an integration branch:
,----
| roland@mirexpress ~/debian/
| Warning: criss-cross merge encountered. See bzr help criss-cross.
| bzr: ERROR: exceptions.
|
| Traceback (most recent call last):
| File "/usr/lib/
| return run_bzr(argv)
| File "/usr/lib/
| ret = run(*run_argv)
| File "/usr/lib/
| return self.run(
| File "/usr/lib/
| conflict_count = merger.do_merge()
| File "/usr/lib/
| change_
| File "/usr/lib/
| change_
| File "/usr/lib/
| file_status = self.merge_
| File "/usr/lib/
| self.text_
| File "/usr/lib/
| lines, conflicts = self._merged_
| File "/usr/lib/
| return textmerge.
| File "/usr/lib/
| for group in self.merge_
| File "/usr/lib/
| for group in struct_iter:
| File "/usr/lib/
| for state, line in self.plan:
| File "/usr/lib/
| yield 'conflicted-b', self.lines_
| IndexError: list index out of range
|
| bzr 1.1.0.candidate.1 on python 2.4.4.final.0 (linux2)
| arguments: ['/usr/bin/bzr', 'merge', '--lca', '/home/
| encoding: 'UTF-8', fsenc: 'UTF-8', lang: 'fr_FR.UTF-8'
| plugins:
| bisect /home/roland/
| bzrtools /usr/lib/
| email /usr/lib/
| gtk /usr/lib/
| launchpad /usr/lib/
| multiparent /usr/lib/
| rebase /usr/lib/
| svn /usr/lib/
| *** 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.
| roland@mirexpress ~/debian/
`----
This seems to be reproducible in a clean chroot even with bzr 1.2
and no plugins. The branches are public and move as time passes, but
I made a snapshot, so the following steps should allow reproducing the
problem:
,----
| bzr branch http://
| cd superpatch
| bzr merge --lca http://
`----
Merging with --diff3 or --weave doesn't exhibit that behaviour.
Roland.
Changed in bzr: | |
status: | New → Fix Committed |
Changed in bzr: | |
status: | Fix Committed → Fix Released |
Changed in bzr: | |
assignee: | nobody → abentley |
importance: | Undecided → Medium |
milestone: | none → 1.3 |