On 9 February 2011 10:15, Steve Franks <[email protected]> wrote: > So, for the first time ever, I have bzr mv 'ed some files around in my tree: > > #bzr status > renamed: > DNT/NT-32/Brd465/layout/NT-32.PcbDoc => > DNT/NT-32/Brd465/layout/Brd465_NT-36.PcbDoc > DNT/NT-32/Brd465/schematic/Brd466.PrjPcb => > DNT/NT-32/Brd465/schematic/Brd465.PrjPcb > > When I then fire up meld against that tree, I get no output on the > screen, and the following in the terminal: > > steve@wynde:~$ Traceback (most recent call last): > File "/usr/lib/meld/meld/task.py", line 130, in iteration > ret = task() > File "/usr/lib/meld/meld/vcview.py", line 294, in _search_recursively_iter > self.vc.cache_inventory(rootname) > File "/usr/lib/meld/meld/vc/_vc.py", line 190, in cache_inventory > self._tree_cache = self._lookup_tree_cache(directory) > File "/usr/lib/meld/meld/vc/bzr.py", line 81, in _lookup_tree_cache > tree_state[os.path.join(rootdir, entry[2:])] = cur_state > UnboundLocalError: local variable 'cur_state' referenced before assignment > Traceback (most recent call last): > File "/usr/lib/meld/meld/task.py", line 130, in iteration > ret = task() > File "/usr/lib/meld/meld/vcview.py", line 294, in _search_recursively_iter > self.vc.cache_inventory(rootname) > File "/usr/lib/meld/meld/vc/_vc.py", line 190, in cache_inventory > self._tree_cache = self._lookup_tree_cache(directory) > File "/usr/lib/meld/meld/vc/bzr.py", line 81, in _lookup_tree_cache > tree_state[os.path.join(rootdir, entry[2:])] = cur_state > UnboundLocalError: local variable 'cur_state' referenced before assignment > > It's not a big issue for me, just committed from the command line, but > I'm available to help debug...
Without testing, the traceback at least should be fixed in: http://git.gnome.org/browse/meld/commit/?id=7452da2ce84775e261229b9fa03598934d36f21f Meld 1.5.0 would be the earliest released version with the fix. Having called it a 'fix', we don't actually deal with moved files for any VC systems right now, but at least we'll show other changes in the tree. cheers, Kai _______________________________________________ meld-list mailing list [email protected] http://mail.gnome.org/mailman/listinfo/meld-list
