qrevert: crash if working tree has tree-conflict
Affects | Status | Importance | Assigned to | Milestone | |
---|---|---|---|---|---|
QBzr |
Fix Released
|
Critical
|
Gary van der Merwe |
Bug Description
If working tree has tree-conflict(e.g. parent-loop), qrevert crashes with traceback:
> Traceback (most recent call last):
> File "C:/Program Files/Bazaar/
> File "C:/Program Files/Bazaar/
> File "C:/Program Files/Bazaar/
> File "C:/Program Files/Bazaar/
> UnboundLocalError: local variable 'change' referenced before assignment
>
> bzr 2.0.2 on python 2.5.4 (Windows-
> arguments: ['bzr', 'qrevert']
> encoding: 'cp932', fsenc: 'mbcs', lang: None
> plugins:
> qbzr C:\Program Files\Bazaar\
I saw this probrem in qbzr-0.16.0 and trunk(r1103).
Related branches
Changed in qbzr: | |
importance: | Undecided → Critical |
tags: | added: qrevert treewidget |
Changed in qbzr: | |
assignee: | nobody → Gary van der Merwe (garyvdm) |
milestone: | none → 0.17 |
status: | New → Fix Released |
To reproduce:
C:\BZR> bzr init A
C:\BZR\A> bzr mkdir foo
C:\BZR\A> bzr mkdir bar
C:\BZR\A> bzr commit -m "initial commit"
C:\BZR> bzr branch A B
C:\BZR\A> bzr move foo bar/foo
C:\BZR\A> bzr commit -m "move foo to bar/foo"
C:\BZR\B> bzr move bar foo/bar
C:\BZR\B> bzr commit -m "move bar to foo/bar"
C:\BZR\B> bzr merge
C:\BZR\B> bzr qrevert