bzr gconflicts outputs error messages when pushing green button and no files are in conflict

Bug #131471 reported by Daniel Nyström
2
Affects Status Importance Assigned to Milestone
Bazaar GTK+ Frontends
Fix Released
Low
Szilveszter Farkas

Bug Description

To reproduce, just type "bzr gconflicts" when no files are in conflicts, a dialog shows up which says "No conflicts in working tree.".
Below there's a field "External utility" (which has "meld" as default), and just right to it there's a button with a green (something).
If you push that button, it will output these error messages:

Traceback (most recent call last):
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/gtk/conflicts.py", line 165, in _on_diff3_clicked
    elif self._get_selected_type() == 'text conflict':
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/gtk/conflicts.py", line 155, in _get_selected_type
    return model.get_value(iter, 2)
ValueError: column number is out of range

Of course this is not an important bug, but it sure is one!

Revision history for this message
Szilveszter Farkas (phanatic) wrote :

Thanks for the bug report. This is a bug of course!

Changed in bzr-gtk:
assignee: nobody → phanatic
importance: Undecided → Low
status: New → Confirmed
Revision history for this message
Daniel Nyström (speakman) wrote :

Isn't this fixed yet? :)
If true, make this report solved, please.

Revision history for this message
Szilveszter Farkas (phanatic) wrote :

Fix committed to trunk (revision 444).

Changed in bzr-gtk:
milestone: none → 0.94.0
status: Confirmed → Fix Committed
Jelmer Vernooij (jelmer)
Changed in bzr-gtk:
status: Fix Committed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.